https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112249
Revision: 112249
Author: reedy
Date: 2012-02-23 22:11:31 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
MFT r112179, r112184
Modified Paths:
--------------
branches/wmf/1.19wmf1/RELEASE-NOTES-1.19
branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderStartUpModule.php
branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
branches/wmf/1.19wmf1/includes/resourceloader/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173,112179,112184
Modified: branches/wmf/1.19wmf1/RELEASE-NOTES-1.19
===================================================================
--- branches/wmf/1.19wmf1/RELEASE-NOTES-1.19 2012-02-23 22:04:18 UTC (rev
112248)
+++ branches/wmf/1.19wmf1/RELEASE-NOTES-1.19 2012-02-23 22:11:31 UTC (rev
112249)
@@ -248,6 +248,8 @@
around a bug where not all styles were applied in Internet Explorer
* (bug 28936, bug 5280) Broken or invalid titles can't be removed from
watchlist.
* (bug 34600) Older skins using useHeadElement=false were broken in 1.18
+* (bug 34604) [mw.config] wgActionPaths should be an object instead of a
numeral
+ array.
=== API changes in 1.19 ===
* Made action=edit less likely to return "unknownerror", by returning the
actual error
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184
Property changes on: branches/wmf/1.19wmf1/includes/resourceloader
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes/resourceloader:100352-107913
/branches/REL1_15/phase3/includes/resourceloader:51646
/branches/new-installer/phase3/includes/resourceloader:43664-66004
/branches/sqlite/includes/resourceloader:58211-58321
/branches/wmf/1.18wmf1/includes/resourceloader:97508,111667
/branches/wmf-deployment/includes/resourceloader:53381
/trunk/phase3/includes/resourceloader:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112052
+ /branches/JSTesting/includes/resourceloader:100352-107913
/branches/REL1_15/phase3/includes/resourceloader:51646
/branches/new-installer/phase3/includes/resourceloader:43664-66004
/branches/sqlite/includes/resourceloader:58211-58321
/branches/wmf/1.18wmf1/includes/resourceloader:97508,111667
/branches/wmf-deployment/includes/resourceloader:53381
/trunk/phase3/includes/resourceloader:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112052,112184
Modified:
branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderStartUpModule.php
===================================================================
---
branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderStartUpModule.php
2012-02-23 22:04:18 UTC (rev 112248)
+++
branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderStartUpModule.php
2012-02-23 22:11:31 UTC (rev 112249)
@@ -68,7 +68,9 @@
'wgScriptExtension' => $wgScriptExtension,
'wgScript' => $wgScript,
'wgVariantArticlePath' => $wgVariantArticlePath,
- 'wgActionPaths' => $wgActionPaths,
+ // Force object to avoid "empty" associative array from
+ // becoming [] instead of {} in JS (bug 34604)
+ 'wgActionPaths' => (object)$wgActionPaths,
'wgServer' => $wgServer,
'wgUserLanguage' => $context->getLanguage(),
'wgContentLanguage' => $wgContLang->getCode(),
Modified: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css
===================================================================
--- branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css
2012-02-23 22:04:18 UTC (rev 112248)
+++ branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css
2012-02-23 22:11:31 UTC (rev 112249)
@@ -1,5 +1,7 @@
.feedback-spinner {
display: inline-block;
+ zoom: 1;
+ *display: inline; /* IE7 and below */
/* @embed */
background: url(mediawiki.feedback.spinner.gif);
width: 18px;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
