| Index: branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderStartUpModule.php |
| — | — | @@ -68,7 +68,9 @@ |
| 69 | 69 | 'wgScriptExtension' => $wgScriptExtension, |
| 70 | 70 | 'wgScript' => $wgScript, |
| 71 | 71 | 'wgVariantArticlePath' => $wgVariantArticlePath, |
| 72 | | - 'wgActionPaths' => $wgActionPaths, |
| | 72 | + // Force object to avoid "empty" associative array from |
| | 73 | + // becoming [] instead of {} in JS (bug 34604) |
| | 74 | + 'wgActionPaths' => (object)$wgActionPaths, |
| 73 | 75 | 'wgServer' => $wgServer, |
| 74 | 76 | 'wgUserLanguage' => $context->getLanguage(), |
| 75 | 77 | 'wgContentLanguage' => $wgContLang->getCode(), |
| Property changes on: branches/wmf/1.19wmf1/includes/resourceloader |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 76 | 78 | Merged /trunk/phase3/includes/resourceloader:r112184 |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 77 | 79 | Merged /trunk/phase3/includes:r112184 |
| Index: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css |
| — | — | @@ -1,5 +1,7 @@ |
| 2 | 2 | .feedback-spinner { |
| 3 | 3 | display: inline-block; |
| | 4 | + zoom: 1; |
| | 5 | + *display: inline; /* IE7 and below */ |
| 4 | 6 | /* @embed */ |
| 5 | 7 | background: url(mediawiki.feedback.spinner.gif); |
| 6 | 8 | width: 18px; |
| Index: branches/wmf/1.19wmf1/RELEASE-NOTES-1.19 |
| — | — | @@ -248,6 +248,8 @@ |
| 249 | 249 | around a bug where not all styles were applied in Internet Explorer |
| 250 | 250 | * (bug 28936, bug 5280) Broken or invalid titles can't be removed from watchlist. |
| 251 | 251 | * (bug 34600) Older skins using useHeadElement=false were broken in 1.18 |
| | 252 | +* (bug 34604) [mw.config] wgActionPaths should be an object instead of a numeral |
| | 253 | + array. |
| 252 | 254 | |
| 253 | 255 | === API changes in 1.19 === |
| 254 | 256 | * Made action=edit less likely to return "unknownerror", by returning the actual error |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 255 | 257 | Merged /trunk/phase3:r112179,112184 |