Changeset 10339

Timestamp:

01/09/2009 07:29:35 PM (18 years ago)

Author:

ryan

Message:

Use preg_replace_callback instead of preg_replace with eval. Props beaulebens. see #8689

Location:

trunk

Files:

• wp-admin/import/blogger.php (modified) (2 diffs)
• wp-admin/import/blogware.php (modified) (2 diffs)
• wp-admin/import/livejournal.php (modified) (2 diffs)
• wp-admin/import/rss.php (modified) (1 diff)
• wp-admin/import/wordpress.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/kses.php (modified) (2 diffs)
• wp-includes/post-template.php (modified) (1 diff)

trunk/wp-admin/import/blogger.php

@@ -551 +551 @@
 
                 // Clean up content
-                $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+                $post_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $post_content);
                 $post_content = str_replace('<br>', '<br />', $post_content);
                 $post_content = str_replace('<hr>', '<hr />', $post_content);
@@ -604 +604 @@
 
                 // Clean up content
-                $comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content);
+                $comment_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $comment_content);
                 $comment_content = str_replace('<br>', '<br />', $comment_content);
                 $comment_content = str_replace('<hr>', '<hr />', $comment_content);

trunk/wp-admin/import/blogware.php

@@ -90 +90 @@
 
                         // Clean up content
-                        $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+                        $post_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $post_content);
                         $post_content = str_replace('<br>', '<br />', $post_content);
                         $post_content = str_replace('<hr>', '<hr />', $post_content);
@@ -130 +130 @@
 
                                         // Clean up content
-                                        $comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content);
+                                        $comment_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $comment_content);
                                         $comment_content = str_replace('<br>', '<br />', $comment_content);
                                         $comment_content = str_replace('<hr>', '<hr />', $comment_content);

trunk/wp-admin/import/livejournal.php

@@ -72 +72 @@
 
                         // Clean up content
-                        $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+                        $post_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $post_content);
                         $post_content = str_replace('<br>', '<br />', $post_content);
                         $post_content = str_replace('<hr>', '<hr />', $post_content);
@@ -108 +108 @@
 
                                         // Clean up content
-                                        $comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content);
+                                        $comment_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $comment_content);
                                         $comment_content = str_replace('<br>', '<br />', $comment_content);
                                         $comment_content = str_replace('<hr>', '<hr />', $comment_content);

trunk/wp-admin/import/rss.php

@@ -104 +104 @@
 
                         // Clean up content
-                        $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+                        $post_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $post_content);
                         $post_content = str_replace('<br>', '<br />', $post_content);
                         $post_content = str_replace('<hr>', '<hr />', $post_content);

trunk/wp-admin/import/wordpress.php

@@ -382 +382 @@
 
                 $post_excerpt = $this->get_tag( $post, 'excerpt:encoded' );
-                $post_excerpt = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_excerpt);
+                $post_excerpt = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $post_excerpt);
                 $post_excerpt = str_replace('<br>', '<br />', $post_excerpt);
                 $post_excerpt = str_replace('<hr>', '<hr />', $post_excerpt);
 
                 $post_content = $this->get_tag( $post, 'content:encoded' );
-                $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+                $post_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $post_content);
                 $post_content = str_replace('<br>', '<br />', $post_content);
                 $post_content = str_replace('<hr>', '<hr />', $post_content);

trunk/wp-includes/formatting.php

@@ -1318 +1318 @@
         } else {
                 $subject = str_replace('_', ' ', $matches[2]);
-                /** @todo use preg_replace_callback() */
-                $subject = preg_replace('#\=([0-9a-f]{2})#ei', "chr(hexdec(strtolower('$1')))", $subject);
+                $subject = preg_replace_callback('#\=([0-9a-f]{2})#i', create_function('$match', 'return chr(hexdec(strtolower($match[1])));'), $subject);
                 return $subject;
         }

trunk/wp-includes/kses.php

@@ -395 +395 @@
  */
 function wp_kses_split($string, $allowed_html, $allowed_protocols) {
-        return preg_replace('%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%e',
-        "wp_kses_split2('\\1', \$allowed_html, ".'$allowed_protocols)', $string);
+        global $pass_allowed_html, $pass_allowed_protocols;
+        $pass_allowed_html = $allowed_html;
+        $pass_allowed_protocols = $allowed_protocols;
+        return preg_replace_callback('%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%',
+                create_function('$match', 'global $pass_allowed_html, $pass_allowed_protocols; return wp_kses_split2($match[1], $pass_allowed_html, $pass_allowed_protocols);'), $string);
 }
 
@@ -1000 +1003 @@
  */
 function wp_kses_decode_entities($string) {
-        $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
-        $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))', $string);
+        $string = preg_replace_callback('/&#([0-9]+);/', create_function('$match', 'return chr($match[1]);'), $string);
+        $string = preg_replace_callback('/&#[Xx]([0-9A-Fa-f]+);/', create_function('$match', 'return chr(hexdec($match[1]));'), $string);
 
         return $string;

trunk/wp-includes/post-template.php

@@ -224 +224 @@
         }
         if ( $preview ) // preview fix for javascript bug with foreign languages
-                $output =       preg_replace('/\%u([0-9A-F]{4,4})/e',   "'&#'.base_convert('\\1',16,10).';'", $output);
+                $output =       preg_replace_callback('/\%u([0-9A-F]{4})/', create_function('$match', 'return "&#" . base_convert($match[1], 16, 10) . ";";'), $output);
 
         return $output;