| Index: branches/wmf/1.16wmf4/maintenance/parserTests.txt |
| — | — | @@ -6398,6 +6398,15 @@ |
| 6399 | 6399 | !! end |
| 6400 | 6400 | |
| 6401 | 6401 | !! test |
| | 6402 | +Bug 22905: <abbr> followed by ISBN followed by </a> |
| | 6403 | +!! input |
| | 6404 | +<abbr>(fr)</abbr> ISBN 2753300917 [http://www.example.com example.com] |
| | 6405 | +!! result |
| | 6406 | +<p><abbr>(fr)</abbr> <a href="https://www.mediawiki.org/wiki/Special:BookSources/2753300917" class="internal mw-magiclink-isbn">ISBN 2753300917</a> <a href="http://www.example.com" class="external text" rel="nofollow">example.com</a> |
| | 6407 | +</p> |
| | 6408 | +!! end |
| | 6409 | + |
| | 6410 | +!! test |
| 6402 | 6411 | Double RFC |
| 6403 | 6412 | !! input |
| 6404 | 6413 | RFC RFC 1234 |
| Index: branches/wmf/1.16wmf4/CREDITS |
| — | — | @@ -114,6 +114,7 @@ |
| 115 | 115 | * ST47 |
| 116 | 116 | * Scott Colcord |
| 117 | 117 | * Simon Walker |
| | 118 | +* Solitarius |
| 118 | 119 | * Stefano Codari |
| 119 | 120 | * Str4nd |
| 120 | 121 | * svip |
| Index: branches/wmf/1.16wmf4/includes/parser/Parser.php |
| — | — | @@ -976,7 +976,7 @@ |
| 977 | 977 | $urlChar = self::EXT_LINK_URL_CLASS; |
| 978 | 978 | $text = preg_replace_callback( |
| 979 | 979 | '!(?: # Start cases |
| 980 | | - (<a.*?</a>) | # m[1]: Skip link text |
| | 980 | + (<a[ \t\r\n>].*?</a>) | # m[1]: Skip link text |
| 981 | 981 | (<.*?>) | # m[2]: Skip stuff inside HTML elements' . " |
| 982 | 982 | (\\b(?:$prots)$urlChar+) | # m[3]: Free external links" . ' |
| 983 | 983 | (?:RFC|PMID)\s+([0-9]+) | # m[4]: RFC or PMID, capture number |
| Property changes on: branches/wmf/1.16wmf4/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 984 | 984 | Merged /trunk/phase3/includes:r64113 |
| Index: branches/wmf/1.16wmf4/RELEASE-NOTES |
| — | — | @@ -17,6 +17,7 @@ |
| 18 | 18 | |
| 19 | 19 | * The maintenance script system was overhauled. Most maintenance scripts now |
| 20 | 20 | have a useful help page when you run them with --help. |
| | 21 | +* (bug 22905) Correctly handle <abbr> followed by ISBN |
| 21 | 22 | |
| 22 | 23 | * AdminSettings.php is no longer required in order to run maintenance scripts. |
| 23 | 24 | You can just set $wgDBadminuser and $wgDBadminpassword in your |
| Property changes on: branches/wmf/1.16wmf4 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 24 | 25 | Merged /trunk/phase3:r64113 |