Changeset 35709 for trunk/src/wp-includes/formatting.php

Timestamp:

11/19/2015 11:31:00 PM (10 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.

File:

• trunk/src/wp-includes/formatting.php (modified) (1 diff)

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 );
 }