From: Platonides
Date: Thu, 24 Jun 2010 13:44:50 +0000 (+0000)
Subject: Follow up r68491.
X-Git-Tag: 1.31.0-rc.0~36399
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=7b3b076f4dc8386c04a9379a818127bca9438825;p=lhc%2Fweb%2Fwiklou.git
Follow up r68491.
Perform doAllQuotes before external links.
Added test case from http://es.wikipedia.org/w/index.php?title=Pablo_Picasso&action=edit§ion=5&oldid=38079844
---
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 421bbb1e2b..9ee2499de8 100644
--- 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 bf94ea81be..0858eb95b1 100644
--- 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
!! 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
+La muerte de Casagemas (1901) en el sitio de Museo Picasso.
+
+!! end
+
!! test
URL-encoding in URL functions (single parameter)
!! input