From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Tue, 8 Jul 2008 20:53:41 +0000 (+0000)
Subject: (bug 14758) unknown_action message was output twice, once formatted and once unformatted
X-Git-Tag: 1.31.0-rc.0~46625
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=f299cc1fc7f5dd575bea1083eb1f3ec289f1ef26;p=lhc%2Fweb%2Fwiklou.git

(bug 14758) unknown_action message was output twice, once formatted and once unformatted
---

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 798fa3f996..86f7da8e64 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -260,12 +260,12 @@ class ApiMain extends ApiBase {
 			$this->printResult(true);
 		}
 
-		$params = $this->extractRequestParams(); 
+		global $wgRequest;
 		if($this->mSquidMaxage == -1)
 		{
 			# Nobody called setCacheMaxAge(), use the (s)maxage parameters
-			$smaxage = $params['smaxage'];
-			$maxage = $params['maxage'];
+			$smaxage = $wgRequest->getVal('smaxage', 0);
+			$maxage = $wgRequest->getVal('maxage', 0);
 		}
 		else
 			$smaxage = $maxage = $this->mSquidMaxage;