| Index: branches/wmf/1.19wmf1/extensions/WebFonts/resources/ext.webfonts.fontlist.js |
| — | — | @@ -388,7 +388,7 @@ |
| 389 | 389 | ttf: "Xsux/Akkadian.ttf", |
| 390 | 390 | woff: "Xsux/Akkadian.woff", |
| 391 | 391 | version: "2.56" |
| 392 | | - }, |
| | 392 | + } |
| 393 | 393 | /* |
| 394 | 394 | "Hapax Berbère": { |
| 395 | 395 | eot: "Tfng/hapaxber.eot", |
| — | — | @@ -442,7 +442,7 @@ |
| 443 | 443 | ta: [ "Lohit Tamil", "Thendral", "Thenee" ], |
| 444 | 444 | tcy: [ "Lohit Kannada", "Kedage" ], |
| 445 | 445 | te: [ "Lohit Telugu", "Pothana2000", "Vemana2000" ], |
| 446 | | - ti: [ "AbyssinicaSIL" ], |
| | 446 | + ti: [ "AbyssinicaSIL" ] |
| 447 | 447 | // tmh: [ "Hapax Berbère" ], |
| 448 | 448 | // tzm: [ "Hapax Berbère" ] |
| 449 | 449 | } |
| Index: branches/wmf/1.19wmf1/tests/parser/parserTests.txt |
| — | — | @@ -8483,6 +8483,16 @@ |
| 8484 | 8484 | !!end |
| 8485 | 8485 | |
| 8486 | 8486 | !! test |
| | 8487 | +Edit comment with section link and text before it (non-local, eg in history list) |
| | 8488 | +!! options |
| | 8489 | +comment title=[[Main Page]] |
| | 8490 | +!! input |
| | 8491 | +pre-comment text /* External links */ removed bogus entries |
| | 8492 | +!! result |
| | 8493 | +pre-comment text - <a href="https://www.mediawiki.org/wiki/Main_Page#External_links" title="Main Page">→</a><span dir="auto"><span class="autocomment">External links: </span> removed bogus entries</span> |
| | 8494 | +!!end |
| | 8495 | + |
| | 8496 | +!! test |
| 8487 | 8497 | Edit comment with section link (local, eg in diff view) |
| 8488 | 8498 | !! options |
| 8489 | 8499 | comment local title=[[Main Page]] |
| Index: branches/wmf/1.19wmf1/includes/Linker.php |
| — | — | @@ -1182,7 +1182,7 @@ |
| 1183 | 1183 | } |
| 1184 | 1184 | if ( $pre ) { |
| 1185 | 1185 | # written summary $presep autocomment (summary /* section */) |
| 1186 | | - $auto = wfMsgExt( 'autocomment-prefix', array( 'escapenoentities', 'content' ) ) . $auto; |
| | 1186 | + $pre .= wfMsgExt( 'autocomment-prefix', array( 'escapenoentities', 'content' ) ); |
| 1187 | 1187 | } |
| 1188 | 1188 | if ( $post ) { |
| 1189 | 1189 | # autocomment $postsep written summary (/* section */ summary) |
| Property changes on: branches/wmf/1.19wmf1/includes/Linker.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1190 | 1190 | Merged /trunk/phase3/includes/Linker.php:r113782 |