api: Fix "PHP Notice: Undefined variable: config"

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

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 3bdc338..9e56819 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -114,16 +114,16 @@ class ApiMain extends ApiBase {
         *                           'params' => array ( $someVarToSubst ) ),
         *                          );
         */
-       private static $mRights = array(
-               'writeapi' => array(
+       private static $mRights = [
+               'writeapi' => [
                        'msg' => 'right-writeapi',
-                       'params' => array()
-               ),
-               'apihighlimits' => array(
+                       'params' => []
+               ],
+               'apihighlimits' => [
                        'msg' => 'api-help-right-apihighlimits',
-                       'params' => array( ApiBase::LIMIT_SML2, ApiBase::LIMIT_BIG2 )
-               )
-       );
+                       'params' => [ ApiBase::LIMIT_SML2, ApiBase::LIMIT_BIG2 ]
+               ]
+       ];
        // @codingStandardsIgnoreEnd
 
        /**
@@ -861,6 +861,7 @@ class ApiMain extends ApiBase {
                        // User entered incorrect parameters - generate error response
                        $errMessage = $e->getMessageArray();
                } else {
+                       $config = $this->getConfig();
                        // Something is seriously wrong
                        if ( ( $e instanceof DBQueryError ) && !$config->get( 'ShowSQLErrors' ) ) {
                                $info = 'Database query error';
@@ -939,7 +940,7 @@ class ApiMain extends ApiBase {
                if ( $this->getConfig()->get( 'ShowHostnames' ) ) {
                        $servedby = $this->getParameter( 'servedby' );
                        if ( $servedby ) {
-                               $result->addValue( null, 'servedby', wfHostName() );
+                               $result->addValue( null, 'servedby', wfHostname() );
                        }
                }