Pass delimiter to preg_quote(). Props Denis-de-Bernardy. see WordPress#9955

ryanboren · ryanboren · commit f2baa0626df8 · 2009-06-23T22:10:46.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@11634 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
@@ -80,8 +80,8 @@ function wptexturize($text) {
 }
 
 function wptexturize_pushpop_element($text, &$stack, $disabled_elements, $opening = '<', $closing = '>') {
-	$o = preg_quote($opening);
-	$c = preg_quote($closing);
+	$o = preg_quote($opening, '/');
+	$c = preg_quote($closing, '/');
 	foreach($disabled_elements as $element) {
 		if (preg_match('/^'.$o.$element.'\b/', $text)) array_push($stack, $element);
 		if (preg_match('/^'.$o.'\/'.$element.$c.'/', $text)) {
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
@@ -2682,7 +2682,7 @@ function smilies_init() {
 		} else {
 			$wp_smiliessearch .= '|';
 		}
-		$wp_smiliessearch .= preg_quote($rest);
+		$wp_smiliessearch .= preg_quote($rest, '/');
 	}
 
 	$wp_smiliessearch .= ')(?:\s|$)/m';
diff --git a/xmlrpc.php b/xmlrpc.php
@@ -3300,7 +3300,7 @@ function pingback_ping($args) {
 
 		$p = explode( "\n\n", $linea );
 
-		$preg_target = preg_quote($pagelinkedto);
+		$preg_target = preg_quote($pagelinkedto, '|');
 
 		foreach ( $p as $para ) {
 			if ( strpos($para, $pagelinkedto) !== false ) { // it exists, but is it a link?
@@ -3322,7 +3322,7 @@ function pingback_ping($args) {
 				$excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
 				$excerpt = strip_tags($excerpt, '<wpcontext>');        // strip all tags but our context marker
 				$excerpt = trim($excerpt);
-				$preg_marker = preg_quote($marker);
+				$preg_marker = preg_quote($marker, '|');
 				$excerpt = preg_replace("|.*?\s(.{0,100}$preg_marker.{0,100})\s.*|s", '$1', $excerpt);
 				$excerpt = strip_tags($excerpt); // YES, again, to remove the marker wrapper
 				break;

Original file line number	Diff line number	Diff line change
`@@ -2682,7 +2682,7 @@ function smilies_init() {`
`2682`	`2682`	`} else {`
`2683`	`2683`	`$wp_smiliessearch .= '\|';`
`2684`	`2684`	`}`
`2685`		`- $wp_smiliessearch .= preg_quote($rest);`
	`2685`	`+ $wp_smiliessearch .= preg_quote($rest, '/');`
`2686`	`2686`	`}`
`2687`	`2687`
`2688`	`2688`	`$wp_smiliessearch .= ')(?:\s\|$)/m';`