From: madman <madman.enwiki@gmail.com>
Date: Mon, 20 Aug 2012 16:56:51 +0000 (+0000)
Subject: Bug 39496: action=info show non-working magic words
X-Git-Tag: 1.31.0-rc.0~22666^2
X-Git-Url: http://git.cyclocoop.org//%27http:/ie7-js.googlecode.com/svn/test/index.html/%27?a=commitdiff_plain;h=72c943c9da104c0dee065e143968e7172b125a64;p=lhc%2Fweb%2Fwiklou.git

Bug 39496: action=info show non-working magic words

Changed localization of magic words to use content language instead of
user's language.

Change-Id: I7cb114c4aa41af911f34ddc63b2cedbb02b015a6
---

diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index a249a77772..60941c87f1 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -56,7 +56,7 @@ class InfoAction extends FormlessAction {
 	 * @return string Page information that will be added to the output
 	 */
 	public function onView() {
-		global $wgDisableCounters, $wgRCMaxAge, $wgRestrictionTypes;
+		global $wgContLang, $wgDisableCounters, $wgRCMaxAge, $wgRestrictionTypes;
 
 		$user = $this->getUser();
 		$lang = $this->getLanguage();
@@ -244,10 +244,8 @@ class InfoAction extends FormlessAction {
 		// Array of magic word IDs
 		$wordIDs = $magicWords->names;
 
-		// @todo FIXME: Should report in content language, as localised
-		//              magic words cannot be used.
 		// Array of IDs => localized magic words
-		$localizedWords = $lang->getMagicWords();
+		$localizedWords = $wgContLang->getMagicWords();
 
 		$listItems = array();
 		foreach ( $pageProperties as $property => $value ) {