(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 798fa3f..86f7da8 100644 (file)
--- 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;