Merge "autocomplete: fix duplicate/missing tracking events"

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

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 0774651..97042af 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -181,6 +181,10 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                $data['legaltitlechars'] = Title::legalChars();
                $data['invalidusernamechars'] = $config->get( 'InvalidUsernameCharacters' );
 
+               $data['allunicodefixes'] = (bool)$config->get( 'AllUnicodeFixes' );
+               $data['fixarabicunicode'] = (bool)$config->get( 'FixArabicUnicode' );
+               $data['fixmalayalamunicode'] = (bool)$config->get( 'FixMalayalamUnicode' );
+
                global $IP;
                $git = SpecialVersion::getGitHeadSha1( $IP );
                if ( $git ) {
@@ -221,6 +225,8 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                }
                $data['writeapi'] = (bool)$config->get( 'EnableWriteAPI' );
 
+               $data['maxarticlesize'] = $config->get( 'MaxArticleSize' ) * 1024;
+
                $tz = $config->get( 'Localtimezone' );
                $offset = $config->get( 'LocalTZoffset' );
                if ( is_null( $tz ) ) {
@@ -245,7 +251,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,10 +270,12 @@ 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' );
+
                Hooks::run( 'APIQuerySiteInfoGeneralInfo', [ $this, &$data ] );
 
                return $this->getResult()->addValue( 'query', $property, $data );