Revert r46138 (Get $wgLegalTitleChars through API) per comments on CodeReview and...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 743dd32..39e9e09 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -106,7 +106,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   created the page, even if it's not the top revision
 * (bug 17069) Added ucshow=patrolled|!patrolled to list=usercontribs
 * action=delete respects $wgDeleteRevisionsLimit and the bigdelete user right
-* (bug 17024) Added legaltitlechars field to meta=siteinfo&siprop=general output
 * (bug 15949) Add undo functionality to action=edit
 
 === Languages updated in 1.15 ===

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 677f558..b4f7445 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -88,7 +88,6 @@ class ApiQuerySiteinfo extends ApiQueryBase {
        protected function appendGeneralInfo( $property ) {
                global $wgSitename, $wgVersion, $wgCapitalLinks, $wgRightsCode, $wgRightsText, $wgContLang;
                global $wgLanguageCode, $IP, $wgEnableWriteAPI, $wgLang, $wgLocaltimezone, $wgLocalTZoffset;
-               global $wgLegalTitleChars;
 
                $data = array();
                $mainPage = Title :: newFromText(wfMsgForContent('mainpage'));
@@ -110,7 +109,6 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                if( $wgContLang->isRTL() ) 
                        $data['rtl'] = '';
                $data['fallback8bitEncoding'] = $wgLang->fallback8bitEncoding();
-               $data['legaltitlechars'] = $wgLegalTitleChars;
                
                if( wfReadOnly() )
                        $data['readonly'] = '';