[mw.config] wgAction shouldn't use direct URL values
authorKrinkle <krinkle@users.mediawiki.org>
Sun, 8 Jan 2012 01:34:59 +0000 (01:34 +0000)
committerKrinkle <krinkle@users.mediawiki.org>
Sun, 8 Jan 2012 01:34:59 +0000 (01:34 +0000)
* Fixes bug 25800
* Depends on r108342

includes/OutputPage.php

index 70d0dd7..955b6a0 100644 (file)
@@ -2822,7 +2822,7 @@ $templates
         * @return array
         */
        public function getJSVars() {
-               global $wgUseAjax, $wgEnableMWSuggest;
+               global $wgUseAjax, $wgEnableMWSuggest, $mediaWiki;
 
                $title = $this->getTitle();
                $ns = $title->getNamespace();
@@ -2858,7 +2858,7 @@ $templates
                        'wgCurRevisionId' => $title->getLatestRevID(),
                        'wgArticleId' => $title->getArticleId(),
                        'wgIsArticle' => $this->isArticle(),
-                       'wgAction' => $this->getRequest()->getText( 'action', 'view' ),
+                       'wgAction' => $mediaWiki->getPerformedAction(),
                        'wgUserName' => $this->getUser()->isAnon() ? null : $this->getUser()->getName(),
                        'wgUserGroups' => $this->getUser()->getEffectiveGroups(),
                        'wgCategories' => $this->getCategories(),