Bug 34604 - [mw.config] wgActionPaths should be an object instead of a numeral array...

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 0cecef8..214e2ee 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -245,6 +245,8 @@ production.
   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

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 8f53ee2..5dbce43 100644 (file)
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -68,7 +68,9 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
                        '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(),