Follow up r68491.

Perform doAllQuotes before external links.
Added test case from http://es.wikipedia.org/w/index.php?title=Pablo_Picasso&action=edit&section=5&oldid=38079844

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 421bbb1..9ee2499 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1073,8 +1073,8 @@ class Parser {
                        $text = $df->reformat( $this->mOptions->getDateFormat(), $text );
                }
                $text = $this->replaceInternalLinks( $text );
-               $text = $this->replaceExternalLinks( $text );
                $text = $this->doAllQuotes( $text );
+               $text = $this->replaceExternalLinks( $text );
 
                # replaceInternalLinks may sometimes leave behind
                # absolute URLs, which have to be masked to hide them from replaceExternalLinks

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index bf94ea8..0858eb9 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -1013,6 +1013,15 @@ External link containing double-single-quotes in text embedded in italics (bug 4
 </p>
 !! end
 
+!! test
+External link containing double-single-quotes with no space separating the url from text in italics
+!! input
+[http://www.musee-picasso.fr/pages/page_id18528_u1l2.htm''La muerte de Casagemas'' (1901) en el sitio de [[Museo Picasso (París)|Museo Picasso]].]
+!! result
+<p><a href="http://www.musee-picasso.fr/pages/page_id18528_u1l2.htm" class="external text" rel="nofollow"><i>La muerte de Casagemas</i> (1901) en el sitio de <a href="/index.php?title=Museo_Picasso_(Par%C3%ADs)&amp;action=edit&amp;redlink=1" class="new" title="Museo Picasso (París) (page does not exist)">Museo Picasso</a>.</a>
+</p>
+!! end
+
 !! test
 URL-encoding in URL functions (single parameter)
 !! input