Merge "ApiQuerySiteInfo: Avoid extra getConfig() calls"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 9 Jun 2016 03:08:25 +0000 (03:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 9 Jun 2016 03:08:25 +0000 (03:08 +0000)
includes/api/ApiQuerySiteinfo.php

index cc755b1..590a712 100644 (file)
@@ -245,7 +245,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 
                $data['uploadsenabled'] = UploadBase::isEnabled();
                $data['maxuploadsize'] = UploadBase::getMaxUploadSize();
-               $data['minuploadchunksize'] = (int)$this->getConfig()->get( 'MinUploadChunkSize' );
+               $data['minuploadchunksize'] = (int)$config->get( 'MinUploadChunkSize' );
 
                $data['thumblimits'] = $config->get( 'ThumbLimits' );
                ApiResult::setArrayType( $data['thumblimits'], 'BCassoc' );
@@ -264,8 +264,8 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                        $data['favicon'] = wfExpandUrl( $favicon, PROTO_RELATIVE );
                }
 
-               $data['centralidlookupprovider'] = $this->getConfig()->get( 'CentralIdLookupProvider' );
-               $providerIds = array_keys( $this->getConfig()->get( 'CentralIdLookupProviders' ) );
+               $data['centralidlookupprovider'] = $config->get( 'CentralIdLookupProvider' );
+               $providerIds = array_keys( $config->get( 'CentralIdLookupProviders' ) );
                $data['allcentralidlookupproviders'] = $providerIds;
 
                $data['interwikimagic'] = (bool)$config->get( 'InterwikiMagic' );