Changeset 35709

Timestamp:

11/19/2015 11:31:00 PM (9 years ago)

Author:

pento

Message:

Texturize: Only convert & to & within text nodes.

Previously, & would be converted everywhere, which caused problems when it was converted within a <script>, for example.

convert_chars() is now removed from the the_content filter, as it was doing the same job as wptexturize().

KSES correctly handles converting & within HTML attributes, so there's no need for wptexturize() and convert_chars() to do the same job.

Fixes #34698.

Location:

trunk

Files:

• src/wp-includes/default-filters.php (modified) (1 diff)
• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/WPTexturize.php (modified) (1 diff)

trunk/src/wp-includes/default-filters.php

@@ -132 +132 @@
 add_filter( 'the_content', 'wptexturize'                       );
 add_filter( 'the_content', 'convert_smilies'                   );
-add_filter( 'the_content', 'convert_chars'                     );
 add_filter( 'the_content', 'wpautop'                           );
 add_filter( 'the_content', 'shortcode_unautop'                 );

trunk/src/wp-includes/formatting.php

@@ -277 +277 @@
                 $curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl );
             }
-        }
-    }
-    $text = implode( '', $textarr );
-
-    // Replace each & with &#038; unless it already looks like an entity.
-    return preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $text );
+
+            // Replace each & with &#038; unless it already looks like an entity.
+            $curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl );
+        }
+    }
+
+    return implode( '', $textarr );
 }
 

trunk/tests/phpunit/tests/formatting/WPTexturize.php

@@ -1268 +1268 @@
             ),
             array(
-                '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy </a> ]',
-                '[ photos by <a href="http://example.com/?a[]=1&#038;a[]=2"> this guy </a> ]',
-            ),
-            array(
-                '[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy </a>]',
-                '[photos by <a href="http://example.com/?a[]=1&#038;a[]=2"> this guy </a>]',
+                '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy & that guy </a> ]',
+                '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy &#038; that guy </a> ]',
+            ),
+            array(
+                '[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy & that guy </a>]',
+                '[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy &#038; that guy </a>]',
             ),
             array(