Fix bug with <nowiki> in front of links for wikis where linkPrefixExtension is true

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dd62f75..1170769 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -277,6 +277,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6965) Cannot include "Template:R" with {{R}} (magic word conflict)
 * Padding parser functions now work with strings like '0' that evaluate to false
 * (bug 10332) Title->userCan( 'edit' ) may return false positive
+* Fix bug with <nowiki> in front of links for wikis where linkPrefixExtension is true
 
 == API changes since 1.10 ==
 

diff --git a/includes/Parser.php b/includes/Parser.php
index 0f2b8e1..ef66344 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -485,7 +485,7 @@ class Parser
                                $inside     = $p[4];
                        }
 
-                       $marker = "$uniq_prefix-$element-" . sprintf('%08X', $n++) . '-QINU';
+                       $marker = "$uniq_prefix-$element-" . sprintf('%08X', $n++) . "-QINU\x07";
                        $stripped .= $marker;
 
                        if ( $close === '/>' ) {
@@ -4633,7 +4633,7 @@ class Parser
                # now that we can be sure that no pseudo-sections are in the source,
                # split it up by section
                $uniq = preg_quote( $this->uniqPrefix(), '/' );
-               $comment = "(?:$uniq-!--.*?QINU)";
+               $comment = "(?:$uniq-!--.*?QINU\x07)";
                $secs = preg_split(
                        "/
                        (