Changeset 35847

Timestamp:

12/09/2015 11:54:24 PM (11 years ago)

Author:

johnbillion

Message:

Formatting: Don't make links inside <script> and <style> tags clickable.

Fixes #30162
Props ninos-ego, adamsilverstein

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -2196 +2196 @@
         foreach ( $textarr as $piece ) {
 
-                if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
+                if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) )
                         $nested_code_pre++;
-                elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
+                elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) )
                         $nested_code_pre--;
 

trunk/tests/phpunit/tests/formatting/MakeClickable.php

@@ -373 +373 @@
                 $this->assertEquals( $html, make_clickable( $html ) );
         }
+
+        /**
+         * @dataProvider data_script_and_style_tags
+         * @ticket 30162
+         */
+        public function test_dont_link_script_and_style_tags( $tag ) {
+                $this->assertEquals( $tag, make_clickable( $tag ) );
+        }
+
+        public function data_script_and_style_tags() {
+                return array(
+                        array(
+                                '<script>http://wordpress.org</script>',
+                        ),
+                        array(
+                                '<style>http://wordpress.org</style>',
+                        ),
+                        array(
+                                '<script type="text/javascript">http://wordpress.org</script>',
+                        ),
+                        array(
+                                '<style type="text/css">http://wordpress.org</style>',
+                        ),
+                );
+        }
+
 }