Changeset 11634

Timestamp:

06/23/2009 10:10:46 PM (16 years ago)

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• xmlrpc.php (modified) (2 diffs)

trunk/wp-includes/formatting.php

@@ -81 +81 @@
 
 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);

trunk/wp-includes/functions.php

@@ -2683 +2683 @@
             $wp_smiliessearch .= '|';
         }
-        $wp_smiliessearch .= preg_quote($rest);
+        $wp_smiliessearch .= preg_quote($rest, '/');
     }
 

trunk/xmlrpc.php

@@ -3301 +3301 @@
         $p = explode( "\n\n", $linea );
 
-        $preg_target = preg_quote($pagelinkedto);
+        $preg_target = preg_quote($pagelinkedto, '|');
 
         foreach ( $p as $para ) {
@@ -3323 +3323 @@
                 $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