https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111231
Revision: 111231 Author: siebrand Date: 2012-02-11 12:17:58 +0000 (Sat, 11 Feb 2012) Log Message: ----------- * Remove last remaining traces of wfLoadExtensionMessages(). * Add missing action message and remove unused global in UploadLocal. * Some whitespace updates in Maps. Modified Paths: -------------- trunk/extensions/CreditTab/CreditTab.php trunk/extensions/EmbedVideo/EmbedVideo.hooks.php trunk/extensions/Favorites/SpecialFavoritelist.php trunk/extensions/Maps/Maps.hooks.php trunk/extensions/MassEditRegex/MassEditRegex.class.php trunk/extensions/MediaWikiAuth/MediaWikiAuth.php trunk/extensions/ReplaceText/ReplaceText.php trunk/extensions/SemanticDrilldown/includes/SD_Utils.php trunk/extensions/SemanticForms/includes/forminputs/SF_CheckboxInput.php trunk/extensions/SemanticFormsInputs/SemanticFormsInputs.php trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.php trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.smw15.php trunk/extensions/SemanticNotifyMe/includes/storage/SMW_SQLStore2_QueriesNM.php trunk/extensions/SemanticNotifyMe/includes/storage/SMW_SQLStore2_QueriesNM.smw15.php trunk/extensions/SemanticProjectManagement/SemanticProjectManagement.php trunk/extensions/SemanticProjectManagement/includes/SPM_SpecialPage.php trunk/extensions/SemanticProjectManagement/includes/SPM_WBS.php trunk/extensions/SemanticWebBrowser/includes/datavalues/SWBResolvableUriValue.php trunk/extensions/SemanticWebBrowser/specials/SearchTriple/SWB_SpecialBrowseWiki.php trunk/extensions/UploadLocal/UploadLocal.i18n.php trunk/extensions/UploadLocal/UploadLocal_body.php trunk/phase3/RELEASE-NOTES-1.20 trunk/phase3/includes/GlobalFunctions.php trunk/phase3/includes/PageQueryPage.php Modified: trunk/extensions/CreditTab/CreditTab.php =================================================================== --- trunk/extensions/CreditTab/CreditTab.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/CreditTab/CreditTab.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -15,7 +15,7 @@ 'path' => __FILE__, 'name' => 'CreditTab', 'author' => '[http://www.dasch-tour.de DaSch]', - 'version' => '1.2.2', + 'version' => '1.3.0', 'descriptionmsg' => 'credits-desc', 'url' => 'https://www.mediawiki.org/wiki/Extension:CreditTab', ); @@ -54,7 +54,7 @@ } else { $title = $obj->mTitle; } - wfLoadExtensionMessages('CreditTab'); + $ctNamespace = $title->getNamespace(); $ctInsert=false; if ( count( $wgCreditTabNamespaces ) > 0 ) { Modified: trunk/extensions/EmbedVideo/EmbedVideo.hooks.php =================================================================== --- trunk/extensions/EmbedVideo/EmbedVideo.hooks.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/EmbedVideo/EmbedVideo.hooks.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -57,8 +57,6 @@ # Initialize things once if (!EmbedVideo::$initialized) { EmbedVideo::VerifyWidthMinAndMax(); - # Add system messages - wfLoadExtensionMessages('embedvideo'); $parser->disableCache(); EmbedVideo::$initialized = true; } Modified: trunk/extensions/Favorites/SpecialFavoritelist.php =================================================================== --- trunk/extensions/Favorites/SpecialFavoritelist.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/Favorites/SpecialFavoritelist.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -13,7 +13,6 @@ class SpecialFavoritelist extends SpecialPage { function __construct() { parent::__construct( 'Favoritelist' ); - wfLoadExtensionMessages('Favoritelist'); } function execute( $par ) { Modified: trunk/extensions/Maps/Maps.hooks.php =================================================================== --- trunk/extensions/Maps/Maps.hooks.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/Maps/Maps.hooks.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -2,20 +2,20 @@ /** * Static class for hooks handled by the Maps extension. - * + * * @since 0.7 - * + * * @file Maps.hooks.php * @ingroup Maps - * + * * @licence GNU GPL v3 * @author Jeroen De Dauw < jeroended...@gmail.com > */ final class MapsHooks { - + /** * Adds a link to Admin Links page. - * + * * @since 0.7 * * @param ALTree $admin_links_tree @@ -23,36 +23,36 @@ * @return true */ public static function addToAdminLinks( ALTree &$admin_links_tree ) { - $displaying_data_section = $admin_links_tree->getSection( wfMsg( 'smw_adminlinks_displayingdata' ) ); - - // Escape if SMW hasn't added links. - if ( is_null( $displaying_data_section ) ) return true; - $smw_docu_row = $displaying_data_section->getRow( 'smw' ); - - $maps_docu_label = wfMsg( 'adminlinks_documentation', 'Maps' ); - $smw_docu_row->addItem( AlItem::newFromExternalLink( 'http://mapping.referata.com/wiki/Maps', $maps_docu_label ) ); - - return true; + $displaying_data_section = $admin_links_tree->getSection( wfMsg( 'smw_adminlinks_displayingdata' ) ); + + // Escape if SMW hasn't added links. + if ( is_null( $displaying_data_section ) ) return true; + $smw_docu_row = $displaying_data_section->getRow( 'smw' ); + + $maps_docu_label = wfMsg( 'adminlinks_documentation', 'Maps' ); + $smw_docu_row->addItem( AlItem::newFromExternalLink( 'http://mapping.referata.com/wiki/Maps', $maps_docu_label ) ); + + return true; } - + /** * Hook to add PHPUnit test cases. - * + * * @since 0.7 - * + * * @param array $files * * @return true */ public static function registerUnitTests( array &$files ) { $testDir = dirname( __FILE__ ) . '/test/'; - + $files[] = $testDir . 'MapsCoordinateParserTest.php'; $files[] = $testDir . 'MapsDistanceParserTest.php'; - + return true; } - + /** * Intercept pages in the Layer namespace to handle them correctly. * @@ -65,10 +65,10 @@ if ( $title->getNamespace() == Maps_NS_LAYER ) { $article = new MapsLayerPage( $title ); } - + return true; } - + /** * Adds global JavaScript variables. * @@ -80,14 +80,14 @@ */ public static function onMakeGlobalVariablesScript( array &$vars ) { global $egMapsGlobalJSVars; - + $vars['egMapsDebugJS'] = $GLOBALS['egMapsDebugJS']; - + $vars += $egMapsGlobalJSVars; - + return true; } - + /** * @since 0.7 * @@ -100,4 +100,4 @@ $list[Maps_NS_LAYER_TALK] = 'Layer_talk'; return true; } -} +} Modified: trunk/extensions/MassEditRegex/MassEditRegex.class.php =================================================================== --- trunk/extensions/MassEditRegex/MassEditRegex.class.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/MassEditRegex/MassEditRegex.class.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -60,8 +60,6 @@ return; } - wfLoadExtensionMessages('MassEditRegex'); - $this->outputHeader(); $strPageList = $wgRequest->getText( 'wpPageList', 'Sandbox' ); Modified: trunk/extensions/MediaWikiAuth/MediaWikiAuth.php =================================================================== --- trunk/extensions/MediaWikiAuth/MediaWikiAuth.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/MediaWikiAuth/MediaWikiAuth.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -134,7 +134,6 @@ $results = unserialize( $this->snoopy->results ); wfDebugLog( 'MediaWikiAuth', 'Login result:' . print_r( $results, true ) ); - wfLoadExtensionMessages( 'MediaWikiAuth' ); $errormsg = wfMsg( 'mwa-error-unknown' ); if ( isset( $results['login'] ) ) { $login = $results['login']; Modified: trunk/extensions/ReplaceText/ReplaceText.php =================================================================== --- trunk/extensions/ReplaceText/ReplaceText.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/ReplaceText/ReplaceText.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -48,11 +48,14 @@ // This function should really go into a "ReplaceText_body.php" file. function rtAddToAdminLinks( &$admin_links_tree ) { $general_section = $admin_links_tree->getSection( wfMsg( 'adminlinks_general' ) ); - $extensions_row = $general_section->getRow( 'extensions' ); + $extensions_row = $general_section->getRow( 'extensions' ); + if ( is_null( $extensions_row ) ) { $extensions_row = new ALRow( 'extensions' ); $general_section->addRow( $extensions_row ); } + $extensions_row->addItem( ALItem::newFromSpecialPage( 'ReplaceText' ) ); + return true; } Modified: trunk/extensions/SemanticDrilldown/includes/SD_Utils.php =================================================================== --- trunk/extensions/SemanticDrilldown/includes/SD_Utils.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticDrilldown/includes/SD_Utils.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -340,9 +340,6 @@ } static function booleanToString( $bool_value ) { - if ( function_exists( 'wfLoadExtensionMessages' ) ) { - wfLoadExtensionMessages( 'SemanticMediaWiki' ); - } $words_field_name = ( $bool_value == true ) ? 'smw_true_words' : 'smw_false_words'; $words_array = explode( ',', wfMsgForContent( $words_field_name ) ); // go with the value in the array that tends to be "yes" or Modified: trunk/extensions/SemanticForms/includes/forminputs/SF_CheckboxInput.php =================================================================== --- trunk/extensions/SemanticForms/includes/forminputs/SF_CheckboxInput.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticForms/includes/forminputs/SF_CheckboxInput.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -43,12 +43,7 @@ // Default to false - no need to check if it matches // a 'false' word. $vlc = strtolower( trim( $cur_value ) ); - // Manually load SMW's message values, if they weren't - // loaded before. - global $wgVersion; - if ( version_compare( $wgVersion, '1.16', '<' ) ) { - wfLoadExtensionMessages( 'SemanticMediaWiki' ); - } + if ( in_array( $vlc, explode( ',', wfMsgForContent( 'smw_true_words' ) ), true ) ) { $checked_str = ' checked="checked"'; } else { Modified: trunk/extensions/SemanticFormsInputs/SemanticFormsInputs.php =================================================================== --- trunk/extensions/SemanticFormsInputs/SemanticFormsInputs.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticFormsInputs/SemanticFormsInputs.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -96,10 +96,5 @@ $sfgFormPrinter->registerInputType( 'SFIMenuSelect' ); $sfgFormPrinter->registerInputType( 'SFIRegExp' ); - // This function has been deprecated in 1.16, but needed for earlier versions. - if ( version_compare( $wgVersion, '1.16', '<' ) ) { - wfLoadExtensionMessages( 'SemanticFormsInputs' ); - } - return true; } Modified: trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.php =================================================================== --- trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -478,7 +478,7 @@ */ protected function getSubqueryDescription( &$setNS, &$label ) { global $smwgQPrintoutLimit; - wfLoadExtensionMessages( 'SemanticMediaWiki' ); + $conjunction = NULL; // used for the current inner conjunction $disjuncts = array(); // (disjunctive) array of subquery conjunctions $printrequests = array(); // the printrequests found for this query level @@ -696,7 +696,7 @@ // modified by ning ,add $relatedArticles protected function getPropertyDescription( $propertyname, &$setNS, &$label, &$relatedArticles ) { global $smwgSMWBetaCompatible; // support for old * printouts of beta - wfLoadExtensionMessages( 'SemanticMediaWiki' ); + $this->readChunk(); // consume separator ":=" or "::" // first process property chain syntax (e.g. "property1.property2::value"): if ( $propertyname { 0 } == ' ' ) { // escape @@ -916,7 +916,7 @@ */ // modified by ning ,add $relatedArticles protected function getArticleDescription( $firstchunk, &$setNS, &$label, &$relatedArticles ) { - wfLoadExtensionMessages( 'SemanticMediaWiki' ); + $chunk = $firstchunk; $result = NULL; $continue = true; @@ -960,7 +960,6 @@ } protected function finishLinkDescription( $chunk, $hasNamespaces, $result, &$setNS, &$label ) { - wfLoadExtensionMessages( 'SemanticMediaWiki' ); if ( $result === NULL ) { // no useful information or concrete error found $this->m_errors[] = wfMsgForContent( 'smw_badqueryatom' ); } elseif ( !$hasNamespaces && $setNS && ( $this->m_defaultns !== NULL ) ) { @@ -1072,7 +1071,6 @@ * also be changed (if it was non-NULL). */ protected function addDescription( $curdesc, $newdesc, $conjunction = true ) { - wfLoadExtensionMessages( 'SemanticMediaWiki' ); $notallowedmessage = 'smw_noqueryfeature'; if ( $newdesc instanceof SMWSomeProperty ) { $allowed = $this->m_queryfeatures & SMW_PROPERTY_QUERY; Modified: trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.smw15.php =================================================================== --- trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.smw15.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.smw15.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -478,7 +478,7 @@ */ protected function getSubqueryDescription( &$setNS, &$label ) { global $smwgQPrintoutLimit; - wfLoadExtensionMessages( 'SemanticMediaWiki' ); + $conjunction = NULL; // used for the current inner conjunction $disjuncts = array(); // (disjunctive) array of subquery conjunctions $printrequests = array(); // the printrequests found for this query level @@ -696,7 +696,7 @@ // modified by ning ,add $relatedArticles protected function getPropertyDescription( $propertyname, &$setNS, &$label, &$relatedArticles ) { global $smwgSMWBetaCompatible; // support for old * printouts of beta - wfLoadExtensionMessages( 'SemanticMediaWiki' ); + $this->readChunk(); // consume separator ":=" or "::" // first process property chain syntax (e.g. "property1.property2::value"): if ( $propertyname { 0 } == ' ' ) { // escape @@ -916,7 +916,6 @@ */ // modified by ning ,add $relatedArticles protected function getArticleDescription( $firstchunk, &$setNS, &$label, &$relatedArticles ) { - wfLoadExtensionMessages( 'SemanticMediaWiki' ); $chunk = $firstchunk; $result = NULL; $continue = true; @@ -960,7 +959,6 @@ } protected function finishLinkDescription( $chunk, $hasNamespaces, $result, &$setNS, &$label ) { - wfLoadExtensionMessages( 'SemanticMediaWiki' ); if ( $result === NULL ) { // no useful information or concrete error found $this->m_errors[] = wfMsgForContent( 'smw_badqueryatom' ); } elseif ( !$hasNamespaces && $setNS && ( $this->m_defaultns !== NULL ) ) { @@ -1072,7 +1070,6 @@ * also be changed (if it was non-NULL). */ protected function addDescription( $curdesc, $newdesc, $conjunction = true ) { - wfLoadExtensionMessages( 'SemanticMediaWiki' ); $notallowedmessage = 'smw_noqueryfeature'; if ( $newdesc instanceof SMWSomeProperty ) { $allowed = $this->m_queryfeatures & SMW_PROPERTY_QUERY; Modified: trunk/extensions/SemanticNotifyMe/includes/storage/SMW_SQLStore2_QueriesNM.php =================================================================== --- trunk/extensions/SemanticNotifyMe/includes/storage/SMW_SQLStore2_QueriesNM.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticNotifyMe/includes/storage/SMW_SQLStore2_QueriesNM.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -282,7 +282,6 @@ $qid = $this->compileQueries( $desc ); $query = $this->m_queries[$qid]; } else { - wfLoadExtensionMessages( 'SemanticMediaWiki' ); $this->m_errors[] = wfMsg( 'smw_concept_cache_miss', $description->getConcept()->getText() ); } } // else: no cache, no description (this may happen); treat like empty concept Modified: trunk/extensions/SemanticNotifyMe/includes/storage/SMW_SQLStore2_QueriesNM.smw15.php =================================================================== --- trunk/extensions/SemanticNotifyMe/includes/storage/SMW_SQLStore2_QueriesNM.smw15.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticNotifyMe/includes/storage/SMW_SQLStore2_QueriesNM.smw15.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -389,11 +389,9 @@ if ( $qid != -1 ) { $query = $this->m_queries[$qid]; } else { // somehow the concept query is no longer valid; maybe some syntax changed (upgrade) or global settings were modified since storing it - smwfLoadExtensionMessages( 'SemanticMediaWiki' ); $this->m_errors[] = wfMsg( 'smw_emptysubquery' ); // not quite the right message, but this case is very rare; let us not make detailed messages for this } } else { - smwfLoadExtensionMessages( 'SemanticMediaWiki' ); $this->m_errors[] = wfMsg( 'smw_concept_cache_miss', $description->getConcept()->getText() ); } } // else: no cache, no description (this may happen); treat like empty concept Modified: trunk/extensions/SemanticProjectManagement/SemanticProjectManagement.php =================================================================== --- trunk/extensions/SemanticProjectManagement/SemanticProjectManagement.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticProjectManagement/SemanticProjectManagement.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -107,7 +107,6 @@ if ( is_null( $displaying_data_section ) ) return true; $smw_docu_row = $displaying_data_section->getRow( 'smw' ); - wfLoadExtensionMessages( 'SemanticProjectManagement' ); $srf_docu_label = wfMsg( 'adminlinks_documentation', wfMsg( 'spm-name' ) ); $smw_docu_row->addItem( AlItem::newFromExternalLink( "http://www.mediawiki.org/wiki/Extension:Semantic_Project_Management", $spm_docu_label ) ); return true; Modified: trunk/extensions/SemanticProjectManagement/includes/SPM_SpecialPage.php =================================================================== --- trunk/extensions/SemanticProjectManagement/includes/SPM_SpecialPage.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticProjectManagement/includes/SPM_SpecialPage.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -34,7 +34,6 @@ */ function __construct() { parent::__construct( 'SemanticProjectManagement' ); - wfLoadExtensionMessages( 'SemanticProjectManagement' ); } //main class function execute( $par ){ Modified: trunk/extensions/SemanticProjectManagement/includes/SPM_WBS.php =================================================================== --- trunk/extensions/SemanticProjectManagement/includes/SPM_WBS.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticProjectManagement/includes/SPM_WBS.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -60,12 +60,9 @@ } public function getName() { - wfLoadExtensionMessages('SemanticProjectManagement'); return wfMsg('spm_printername_wbs'); } - - /** * This method renders the result set provided by SMW according to the printer * @@ -181,7 +178,6 @@ if ($this->getSearchLabel($outputmode)) { $label = $this->getSearchLabel($outputmode); } else { - wfLoadExtensionMessages('SemanticProjectManagement'); $label = wfMsgForContent('spm_wbs_link'); } $link = $res->getQueryLink($label); Modified: trunk/extensions/SemanticWebBrowser/includes/datavalues/SWBResolvableUriValue.php =================================================================== --- trunk/extensions/SemanticWebBrowser/includes/datavalues/SWBResolvableUriValue.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticWebBrowser/includes/datavalues/SWBResolvableUriValue.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -28,7 +28,6 @@ protected function parseUserValue( $value ) { // echo "parseUserValue"; - smwfLoadExtensionMessages( 'SemanticMediaWiki' ); $value = trim( $value ); $this->m_wikitext = $value; if ( $this->m_caption === false ) { Modified: trunk/extensions/SemanticWebBrowser/specials/SearchTriple/SWB_SpecialBrowseWiki.php =================================================================== --- trunk/extensions/SemanticWebBrowser/specials/SearchTriple/SWB_SpecialBrowseWiki.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/SemanticWebBrowser/specials/SearchTriple/SWB_SpecialBrowseWiki.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -52,7 +52,7 @@ public function __construct() { global $smwgBrowseShowAll; parent::__construct( 'BrowseWiki', '', true, false, 'default', true ); - smwfLoadExtensionMessages( 'SemanticMediaWiki' ); + if ( $smwgBrowseShowAll ) { SWBSpecialBrowseWiki::$incomingvaluescount = 21; SWBSpecialBrowseWiki::$incomingpropertiescount = - 1; Modified: trunk/extensions/UploadLocal/UploadLocal.i18n.php =================================================================== --- trunk/extensions/UploadLocal/UploadLocal.i18n.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/UploadLocal/UploadLocal.i18n.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -46,5 +46,6 @@ 'uploadlocal_error_unknown' => 'An unknown error occurred.', 'right-uploadlocal' => 'Upload files from the local machine' + 'action-uploadlocal' => 'upload files from the local machine' ); Modified: trunk/extensions/UploadLocal/UploadLocal_body.php =================================================================== --- trunk/extensions/UploadLocal/UploadLocal_body.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/extensions/UploadLocal/UploadLocal_body.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -3,12 +3,10 @@ class UploadLocal extends SpecialPage { function __construct() { parent::__construct( 'UploadLocal', 'uploadlocal' ); - wfLoadExtensionMessages( 'UploadLocal' ); } function execute( $par ) { - global $wgRequest, $wgUploadLocalDirectory, $wgMessageCache; - wfLoadExtensionMessages( 'UploadLocal' ); + global $wgRequest, $wgUploadLocalDirectory; $prefix = 'extensions/UploadLocal/'; require($prefix . 'UploadLocalDirectory.php'); Modified: trunk/phase3/RELEASE-NOTES-1.20 =================================================================== --- trunk/phase3/RELEASE-NOTES-1.20 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/phase3/RELEASE-NOTES-1.20 2012-02-11 12:17:58 UTC (rev 111231) @@ -15,6 +15,7 @@ === New features in 1.20 === * Added TitleIsKnown hook which gets called when determining if a page exists. * (bug 32341) Add upload by URL domain limitation. +* wfLoadExtensionMessages() was removed. Deprecated in 1.16, removed in 1.20. === Bug fixes in 1.20 === * (bug 30245) Use the correct way to construct a log page title. Modified: trunk/phase3/includes/GlobalFunctions.php =================================================================== --- trunk/phase3/includes/GlobalFunctions.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/phase3/includes/GlobalFunctions.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -3567,16 +3567,6 @@ } /** - * Load an extension messages file - * - * @deprecated since 1.16, warnings in 1.18, remove in 1.20 - * @codeCoverageIgnore - */ -function wfLoadExtensionMessages() { - wfDeprecated( __FUNCTION__, '1.16' ); -} - -/** * Get a platform-independent path to the null file, e.g. /dev/null * * @return string Modified: trunk/phase3/includes/PageQueryPage.php =================================================================== --- trunk/phase3/includes/PageQueryPage.php 2012-02-11 12:12:57 UTC (rev 111230) +++ trunk/phase3/includes/PageQueryPage.php 2012-02-11 12:17:58 UTC (rev 111231) @@ -6,7 +6,6 @@ * @ingroup SpecialPage */ abstract class PageQueryPage extends QueryPage { - /** * Format the result as a simple link to the page * @@ -16,11 +15,14 @@ */ public function formatResult( $skin, $row ) { global $wgContLang; + $title = Title::makeTitleSafe( $row->namespace, $row->title ); $text = $row->title; + if ( $title instanceof Title ) { $text = $wgContLang->convert( $title->getPrefixedText() ); } + return Linker::linkKnown( $title, htmlspecialchars( $text ) ); } } _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs