Changeset 26094

Timestamp:

11/11/2013 09:53:08 PM (11 years ago)

Author:

wonderboymusic

Message:

Make HTML tag searches for <code> and <pre> case-insensitive in make_clickable().

Props bpetty.
Fixes #23756.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/MakeClickable.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -1171 +1171 @@
 function balanceTags( $text, $force = false ) {
     if ( $force || get_option('use_balanceTags') == 1 ) {
-        $balance_tags_delimiters = apply_filters( 'balance_tags_delimiters', array( '<!--more.*?-->', '<!--nextpage-->' ) ); 
+        $balance_tags_delimiters = apply_filters( 'balance_tags_delimiters', array( '<!--more.*?-->', '<!--nextpage-->' ) );
         // Capture lets PREG_SPLIT_DELIM_CAPTURE return the delimiters
         $delimiters_regex = '/(' . implode( '|', $balance_tags_delimiters ) . ')/';
@@ -1610 +1610 @@
     foreach ( $textarr as $piece ) {
 
-        if ( preg_match( '|^<code[\s>]|', $piece ) || preg_match( '|^<pre[\s>]|', $piece ) )
+        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
             $nested_code_pre++;
-        elseif ( ( '</code>' === $piece || '</pre>' === $piece ) && $nested_code_pre )
+        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
             $nested_code_pre--;
 

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

@@ -302 +302 @@
             'URL before pre http://wordpress.org<pre>http://wordpress.org</pre>',
             'URL before code http://wordpress.org<code>http://wordpress.org</code>',
-            'URL after pre <pre>http://wordpress.org</pre>http://wordpress.org',
+            'URL after pre <PRE>http://wordpress.org</PRE>http://wordpress.org',
             'URL after code <code>http://wordpress.org</code>http://wordpress.org',
             'URL before and after pre http://wordpress.org<pre>http://wordpress.org</pre>http://wordpress.org',
@@ -318 +318 @@
             'URL before pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre>',
             'URL before code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code>',
-            'URL after pre <pre>http://wordpress.org</pre><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
+            'URL after pre <PRE>http://wordpress.org</PRE><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
             'URL after code <code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
             'URL before and after pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',