https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114160
Revision: 114160
Author: nikerabbit
Date: 2012-03-19 18:09:40 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
1.19wmf1 MFT r113910 r113782
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/WebFonts/resources/ext.webfonts.fontlist.js
branches/wmf/1.19wmf1/includes/Linker.php
branches/wmf/1.19wmf1/tests/parser/parserTests.txt
Property Changed:
----------------
branches/wmf/1.19wmf1/includes/Linker.php
Modified:
branches/wmf/1.19wmf1/extensions/WebFonts/resources/ext.webfonts.fontlist.js
===================================================================
---
branches/wmf/1.19wmf1/extensions/WebFonts/resources/ext.webfonts.fontlist.js
2012-03-19 17:49:00 UTC (rev 114159)
+++
branches/wmf/1.19wmf1/extensions/WebFonts/resources/ext.webfonts.fontlist.js
2012-03-19 18:09:40 UTC (rev 114160)
@@ -388,7 +388,7 @@
ttf: "Xsux/Akkadian.ttf",
woff: "Xsux/Akkadian.woff",
version: "2.56"
- },
+ }
/*
"Hapax Berbère": {
eot: "Tfng/hapaxber.eot",
@@ -442,7 +442,7 @@
ta: [ "Lohit Tamil", "Thendral", "Thenee" ],
tcy: [ "Lohit Kannada", "Kedage" ],
te: [ "Lohit Telugu", "Pothana2000", "Vemana2000" ],
- ti: [ "AbyssinicaSIL" ],
+ ti: [ "AbyssinicaSIL" ]
// tmh: [ "Hapax Berbère" ],
// tzm: [ "Hapax Berbère" ]
}
Modified: branches/wmf/1.19wmf1/includes/Linker.php
===================================================================
--- branches/wmf/1.19wmf1/includes/Linker.php 2012-03-19 17:49:00 UTC (rev
114159)
+++ branches/wmf/1.19wmf1/includes/Linker.php 2012-03-19 18:09:40 UTC (rev
114160)
@@ -1182,7 +1182,7 @@
}
if ( $pre ) {
# written summary $presep autocomment (summary /*
section */)
- $auto = wfMsgExt( 'autocomment-prefix', array(
'escapenoentities', 'content' ) ) . $auto;
+ $pre .= wfMsgExt( 'autocomment-prefix', array(
'escapenoentities', 'content' ) );
}
if ( $post ) {
# autocomment $postsep written summary (/* section */
summary)
Property changes on: branches/wmf/1.19wmf1/includes/Linker.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes/Linker.php:100352-107913
/branches/REL1_15/phase3/includes/Linker.php:51646
/branches/new-installer/phase3/includes/Linker.php:43664-66004
/branches/sqlite/includes/Linker.php:58211-58321
/branches/wmf/1.18wmf1/includes/Linker.php:97508,111667
/branches/wmf-deployment/includes/Linker.php:53381
/trunk/phase3/includes/Linker.php:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111673,111695,111697,111750,111798
+ /branches/JSTesting/includes/Linker.php:100352-107913
/branches/REL1_15/phase3/includes/Linker.php:51646
/branches/new-installer/phase3/includes/Linker.php:43664-66004
/branches/sqlite/includes/Linker.php:58211-58321
/branches/wmf/1.18wmf1/includes/Linker.php:97508,111667
/branches/wmf-deployment/includes/Linker.php:53381
/trunk/phase3/includes/Linker.php:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111673,111695,111697,111750,111798,113782
Modified: branches/wmf/1.19wmf1/tests/parser/parserTests.txt
===================================================================
--- branches/wmf/1.19wmf1/tests/parser/parserTests.txt 2012-03-19 17:49:00 UTC
(rev 114159)
+++ branches/wmf/1.19wmf1/tests/parser/parserTests.txt 2012-03-19 18:09:40 UTC
(rev 114160)
@@ -8483,6 +8483,16 @@
!!end
!! test
+Edit comment with section link and text before it (non-local, eg in history
list)
+!! options
+comment title=[[Main Page]]
+!! input
+pre-comment text /* External links */ removed bogus entries
+!! result
+pre-comment text - <a href="/wiki/Main_Page#External_links" title="Main
Page">→</a><span dir="auto"><span class="autocomment">External links: </span>
removed bogus entries</span>
+!!end
+
+!! test
Edit comment with section link (local, eg in diff view)
!! options
comment local title=[[Main Page]]
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
