Changeset 6162

Timestamp:

12/12/2016 02:06:38 PM (8 years ago)

Author:

xknown

Message:

Branch 0.9: Remove all the expressions that use the preg_replace function with the e modifier.

The e(val) modifier is not longer supported in PHP7, use preg_replace_callback instead.
See #3033

File:

• branches/0.9/bb-includes/kses.php (modified) (6 diffs)

branches/0.9/bb-includes/kses.php

@@ -46 +46 @@
 ###############################################################################
 {
-  return preg_replace('%(<'.   # EITHER: <
+  global $pass_allowed_html, $pass_allowed_protocols;
+  $pass_allowed_html = $allowed_html;
+  $pass_allowed_protocols = $allowed_protocols;
+  return preg_replace_callback('%(<'.   # EITHER: <
                       '[^>]*'. # things that aren't >
                       '(>|$)'. # > or end of string
-                      '|>)%e', # OR: just a >
-                      "wp_kses_split2('\\1', \$allowed_html, ".
-                      '$allowed_protocols)',
+                      '|>)%', # OR: just a >
+                      '_wp_kses_split_callback',
                       $string);
 } # function wp_kses_split
 
+function _wp_kses_split_callback( $match )
+{
+    global $pass_allowed_html, $pass_allowed_protocols;
+    return wp_kses_split2( $match[1], $pass_allowed_html, $pass_allowed_protocols );
+}
 
 function wp_kses_split2($string, $allowed_html, $allowed_protocols)
@@ -435 +442 @@
 ###############################################################################
 {
-  return preg_replace('/^((&[^;]*;|[\sA-Za-z0-9])*)'.
-                      '(:|&#58;|&#[Xx]3[Aa];)\s*/e',
-                      'wp_kses_bad_protocol_once2("\\1", $allowed_protocols)',
-                      $string);
+  $string2 = preg_split( '/:|&#0*58;|&#x0*3a;/i', $string, 2 );
+  if ( isset($string2[1]) && ! preg_match('%/\?%', $string2[0]) )
+    $string = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols ) . trim( $string2[1] );
+  return $string;
 } # function wp_kses_bad_protocol_once
-
 
 function wp_kses_bad_protocol_once2($string, $allowed_protocols)
@@ -482 +488 @@
   $string = preg_replace('/&amp;([A-Za-z][A-Za-z0-9]{0,19});/',
                          '&\\1;', $string);
-  $string = preg_replace('/&amp;#0*([0-9]{1,5});/e',
-                         'wp_kses_normalize_entities2("\\1")', $string);
+  $string = preg_replace_callback('/&amp;#0*([0-9]{1,5});/',
+                         '_wp_kses_normalize_entities_callback', $string);
   $string = preg_replace('/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
                          '&#\\1\\2;', $string);
@@ -490 +496 @@
 } # function wp_kses_normalize_entities
 
+function _wp_kses_normalize_entities_callback($match) {
+  return wp_kses_normalize_entities2($match[1]);
+}
 
 function wp_kses_normalize_entities2($i)
@@ -508 +517 @@
 ###############################################################################
 {
-  $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
-  $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))',
+  $string = preg_replace_callback('/&#([0-9]+);/', '_wp_kses_decode_entities_chr', $string);
+  $string = preg_replace_callback('/&#[Xx]([0-9A-Fa-f]+);/', '_wp_kses_decode_entities_chr_hexdec',
                          $string);
 
@@ -515 +524 @@
 } # function wp_kses_decode_entities
 
+# Regex callback for wp_kses_decode_entities()
+function _wp_kses_decode_entities_chr( $match ) {
+  return chr( $match[1] );
+}
+
+##
+function _wp_kses_decode_entities_chr_hexdec( $match ) {
+  return chr( hexdec( $match[1] ) );
+}
 ?>