WordPress.org
Get WordPress

Make WordPress Core

Ticket #23756: ticket-23756-ignore-case.patch

File ticket-23756-ignore-case.patch, 3.0 KB (added by bpetty, 11 years ago)

  • src/wp-includes/formatting.php 

    diff --git src/wp-includes/formatting.php src/wp-includes/formatting.php
index fc982cc..acba69e 100644
    function make_clickable( $text ) { 
    16091609        $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
    16101610        foreach ( $textarr as $piece ) {
    16111611
    1612                 if ( preg_match( '|^<code[\s>]|', $piece ) || preg_match( '|^<pre[\s>]|', $piece ) )
     1612                if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
    16131613                        $nested_code_pre++;
    1614                 elseif ( ( '</code>' === $piece || '</pre>' === $piece ) && $nested_code_pre )
     1614                elseif ( ( '</code>' === strtolower($piece) || '</pre>' === strtolower($piece) ) && $nested_code_pre )
    16151615                        $nested_code_pre--;
    16161616
    16171617                if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {

  • tests/phpunit/tests/formatting/MakeClickable.php 

    diff --git tests/phpunit/tests/formatting/MakeClickable.php tests/phpunit/tests/formatting/MakeClickable.php
index 221635d..f6ae895 100644
    class Tests_Formatting_MakeClickable extends WP_UnitTestCase { 
    301301                        '<codecustomtag>http://wordpress.org</codecustomtag>',
    302302                        'URL before pre http://wordpress.org<pre>http://wordpress.org</pre>',
    303303                        'URL before code http://wordpress.org<code>http://wordpress.org</code>',
    304                         'URL after pre <pre>http://wordpress.org</pre>http://wordpress.org',
     304                        'URL after pre <PRE>http://wordpress.org</PRE>http://wordpress.org',
    305305                        'URL after code <code>http://wordpress.org</code>http://wordpress.org',
    306306                        'URL before and after pre http://wordpress.org<pre>http://wordpress.org</pre>http://wordpress.org',
    307307                        'URL before and after code http://wordpress.org<code>http://wordpress.org</code>http://wordpress.org',
    … … class Tests_Formatting_MakeClickable extends WP_UnitTestCase { 
    317317                        '<codecustomtag><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a></codecustomtag>',
    318318                        'URL before pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre>',
    319319                        'URL before code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code>',
    320                         'URL after pre <pre>http://wordpress.org</pre><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
     320                        'URL after pre <PRE>http://wordpress.org</PRE><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
    321321                        'URL after code <code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
    322322                        '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>',
    323323                        'URL before and after code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',