From: Krinkle <krinkle@users.mediawiki.org>
Date: Sun, 8 Jan 2012 01:34:59 +0000 (+0000)
Subject: [mw.config] wgAction shouldn't use direct URL values
X-Git-Tag: 1.31.0-rc.0~25435
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=9c886da92e1b8ee92abdfc07981c53678338191a;p=lhc%2Fweb%2Fwiklou.git

[mw.config] wgAction shouldn't use direct URL values
* Fixes bug 25800
* Depends on r108342
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 70d0dd75d8..955b6a0a78 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -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(),