API change: Registration time of users registered before the DB field was created...

[lhc/web/wiklou.git] / includes / api / ApiMain.php

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 69124a1..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;
@@ -314,14 +314,21 @@ class ApiMain extends ApiBase {
                                        ApiResult :: setContent($errMessage, $this->makeHelpMsg());
 
                        } else {
+                               global $wgShowSQLErrors, $wgShowExceptionDetails;
                                //
                                // Something is seriously wrong
                                //
+                               if ( ( $e instanceof DBQueryError ) && !$wgShowSQLErrors ) {
+                                       $info = "Database query error";
+                               } else {
+                                       $info = "Exception Caught: {$e->getMessage()}";
+                               }
+
                                $errMessage = array (
                                        'code' => 'internal_api_error_'. get_class($e),
-                                       'info' => "Exception Caught: {$e->getMessage()}"
+                                       'info' => $info,
                                );
-                               ApiResult :: setContent($errMessage, "\n\n{$e->getTraceAsString()}\n\n");
+                               ApiResult :: setContent($errMessage, $wgShowExceptionDetails ? "\n\n{$e->getTraceAsString()}\n\n" : "" );                               
                        }
 
                        $this->getResult()->reset();