https://www.mediawiki.org/wiki/Special:Code/MediaWiki/108343
Revision: 108343
Author: krinkle
Date: 2012-01-08 01:34:59 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
[mw.config] wgAction shouldn't use direct URL values
* Fixes bug 25800
* Depends on r108342
Modified Paths:
--------------
trunk/phase3/includes/OutputPage.php
Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php 2012-01-08 01:31:56 UTC (rev
108342)
+++ trunk/phase3/includes/OutputPage.php 2012-01-08 01:34:59 UTC (rev
108343)
@@ -2822,7 +2822,7 @@
* @return array
*/
public function getJSVars() {
- global $wgUseAjax, $wgEnableMWSuggest;
+ global $wgUseAjax, $wgEnableMWSuggest, $mediaWiki;
$title = $this->getTitle();
$ns = $title->getNamespace();
@@ -2858,7 +2858,7 @@
'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(),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
