| Index: trunk/extensions/DeleteBatch/DeleteBatch.body.php |
| — | — | @@ -1,7 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | class DeleteBatch extends SpecialPage { |
| 5 | | - |
| 6 | 5 | /** |
| 7 | 6 | * Constructor |
| 8 | 7 | */ |
| — | — | @@ -35,8 +34,6 @@ |
| 36 | 35 | return; |
| 37 | 36 | } |
| 38 | 37 | |
| 39 | | - wfLoadExtensionMessages( 'DeleteBatch' ); |
| 40 | | - |
| 41 | 38 | $wgOut->setPageTitle( wfMsg( 'deletebatch-title' ) ); |
| 42 | 39 | $cSF = new DeleteBatchForm( $par, $this->getTitle() ); |
| 43 | 40 | |
| Index: trunk/extensions/Interwiki/Interwiki_body.php |
| — | — | @@ -4,7 +4,6 @@ |
| 5 | 5 | * @ingroup SpecialPage |
| 6 | 6 | */ |
| 7 | 7 | class SpecialInterwiki extends SpecialPage { |
| 8 | | - |
| 9 | 8 | /** |
| 10 | 9 | * Constructor - sets up the new special page |
| 11 | 10 | */ |
| — | — | @@ -27,8 +26,6 @@ |
| 28 | 27 | public function execute( $par ) { |
| 29 | 28 | global $wgRequest, $wgOut, $wgUser; |
| 30 | 29 | |
| 31 | | - wfLoadExtensionMessages( 'Interwiki' ); |
| 32 | | - |
| 33 | 30 | $admin = $wgUser->isAllowed( 'interwiki' ); |
| 34 | 31 | |
| 35 | 32 | $this->setHeaders(); |
| — | — | @@ -326,4 +323,4 @@ |
| 327 | 324 | $wgOut->wrapWikiMsg( "<p class='error'>$1</p>", $args ); |
| 328 | 325 | } |
| 329 | 326 | |
| 330 | | -} |
| \ No newline at end of file |
| | 327 | +} |
| Index: trunk/extensions/Babel/Babel.class.php |
| — | — | @@ -26,10 +26,6 @@ |
| 27 | 27 | // to the parameters passed to the babel parser function. |
| 28 | 28 | unset( $parameters[ 0 ] ); |
| 29 | 29 | |
| 30 | | - // Load the extension messages in basic languages (en, content and |
| 31 | | - // user). |
| 32 | | - wfLoadExtensionMessages( 'Babel' ); |
| 33 | | - |
| 34 | 30 | // Load various often used messages into the message member variables. |
| 35 | 31 | $this->_getMessages(); |
| 36 | 32 | |
| — | — | @@ -231,13 +227,6 @@ |
| 232 | 228 | // Get MediaWiki supported language codes\names. |
| 233 | 229 | $nativeNames = Language::getLanguageNames(); |
| 234 | 230 | |
| 235 | | - // Load extension messages for box language and it's fallback if it is |
| 236 | | - // a valid MediaWiki language. |
| 237 | | - if ( array_key_exists( $code, $nativeNames ) ) { |
| 238 | | - wfLoadExtensionMessages( 'Babel', $code ); |
| 239 | | - wfLoadExtensionMessages( 'Babel', Language::getFallbackFor( $code ) ); |
| 240 | | - } |
| 241 | | - |
| 242 | 231 | // Get the language names. |
| 243 | 232 | $name = BabelLanguageCodes::getName( $code ); |
| 244 | 233 | |
| Index: trunk/extensions/Babel/BabelAutoCreate.class.php |
| — | — | @@ -11,7 +11,6 @@ |
| 12 | 12 | * Abort user creation if the username is that of the autocreation username. |
| 13 | 13 | */ |
| 14 | 14 | public static function RegisterAbort( User $user, &$message ) { |
| 15 | | - wfLoadExtensionMessages( 'Babel' ); |
| 16 | 15 | $message = wfMsg( 'babel-autocreate-abort', wfMsg( 'babel-url' ) ); |
| 17 | 16 | return !( $user->getName() === wfMsgForContent( 'babel-autocreate-user' ) ); |
| 18 | 17 | } |
| Index: trunk/extensions/Validator/Validator.php |
| — | — | @@ -88,7 +88,8 @@ |
| 89 | 89 | function efValidatorSetup() { |
| 90 | 90 | // This function has been deprecated in 1.16, but needed for earlier versions. |
| 91 | 91 | // It's present in 1.16 as a stub, but lets check if it exists in case it gets removed at some point. |
| 92 | | - if ( function_exists( 'wfLoadExtensionMessages' ) ) { |
| | 92 | + global $wgVersion; |
| | 93 | + if ( version_compare( $wgVersion, '1.15', '<=' ) ) { |
| 93 | 94 | wfLoadExtensionMessages( 'Validator' ); |
| 94 | 95 | } |
| 95 | 96 | |
| Index: trunk/extensions/Maps/Maps.php |
| — | — | @@ -160,11 +160,11 @@ |
| 161 | 161 | * @return true |
| 162 | 162 | */ |
| 163 | 163 | function efMapsSetup() { |
| 164 | | - global $wgExtensionCredits, $wgLang, $wgExtraNamespaces, $wgNamespaceAliases; |
| | 164 | + global $wgExtensionCredits, $wgLang, $wgExtraNamespaces, $wgNamespaceAliases, $wgVersion; |
| 165 | 165 | |
| 166 | 166 | // This function has been deprecated in 1.16, but needed for earlier versions. |
| 167 | 167 | // It's present in 1.16 as a stub, but lets check if it exists in case it gets removed at some point. |
| 168 | | - if ( function_exists( 'wfLoadExtensionMessages' ) ) { |
| | 168 | + if ( version_compare( $wgVersion, '1.15', '<=' ) ) { |
| 169 | 169 | wfLoadExtensionMessages( 'Maps' ); |
| 170 | 170 | } |
| 171 | 171 | |
| Index: trunk/extensions/APC/SpecialAPC.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | |
| 47 | 47 | public function execute( $parameters ) { |
| 48 | 48 | global $wgOut, $wgScriptPath, $wgStyleVersion, $wgUser; |
| 49 | | - wfLoadExtensionMessages( 'APC' ); |
| | 49 | + |
| 50 | 50 | $this->setHeaders(); |
| 51 | 51 | $this->setup(); |
| 52 | 52 | |
| Index: trunk/extensions/WebChat/WebChat_body.php |
| — | — | @@ -1,5 +1,4 @@ |
| 2 | 2 | <?php |
| 3 | | - |
| 4 | 3 | /** |
| 5 | 4 | * WebChat extension special page class. |
| 6 | 5 | */ |
| — | — | @@ -13,7 +12,7 @@ |
| 14 | 13 | function execute( $par ) { |
| 15 | 14 | global $wgOut, $wgUser, $wgWebChatServer, $wgWebChatChannel, |
| 16 | 15 | $wgWebChatClient, $wgWebChatClients; |
| 17 | | - wfLoadExtensionMessages( 'WebChat' ); |
| | 16 | + |
| 18 | 17 | $this->setHeaders(); |
| 19 | 18 | $wgOut->addWikiMsg( 'webchat-header' ); |
| 20 | 19 | |
| — | — | @@ -60,5 +59,4 @@ |
| 61 | 60 | ) ); |
| 62 | 61 | |
| 63 | 62 | } |
| 64 | | - |
| 65 | 63 | } |
| Index: trunk/extensions/LanguageSelector/LanguageSelector.php |
| — | — | @@ -95,7 +95,6 @@ |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | function wfLanguageSelectorExtension() { |
| 99 | | - wfLoadExtensionMessages( 'LanguageSelector' ); |
| 100 | 99 | global $wgLanguageSelectorLanguages, $wgLanguageSelectorDetectLanguage, |
| 101 | 100 | $wgLanguageSelectorRequestedLanguage, $wgLanguageSelectorLocation, |
| 102 | 101 | $wgLanguageSelectorShowAll, $wgCommandLineMode; |
| Index: trunk/extensions/GoogleAdSense/GoogleAdSense.class.php |
| — | — | @@ -28,7 +28,6 @@ |
| 29 | 29 | return $bar; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | | - wfLoadExtensionMessages( 'GoogleAdSense' ); |
| 33 | 32 | $bar['googleadsense'] = "<script type=\"text/javascript\"> |
| 34 | 33 | /* <![CDATA[ */ |
| 35 | 34 | google_ad_client = \"$wgGoogleAdSenseClient\"; |
| Index: trunk/extensions/ReplaceText/SpecialReplaceText.php |
| — | — | @@ -1,15 +1,11 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | | -if ( !defined( 'MEDIAWIKI' ) ) die(); |
| 5 | | - |
| 6 | 4 | class ReplaceText extends SpecialPage { |
| 7 | | - |
| 8 | 5 | /** |
| 9 | 6 | * Constructor |
| 10 | 7 | */ |
| 11 | 8 | public function __construct() { |
| 12 | 9 | parent::__construct( 'ReplaceText', 'replacetext' ); |
| 13 | | - wfLoadExtensionMessages( 'ReplaceText' ); |
| 14 | 10 | } |
| 15 | 11 | |
| 16 | 12 | function execute( $query ) { |
| Index: trunk/extensions/I18nTags/I18nTags.php |
| — | — | @@ -33,7 +33,6 @@ |
| 34 | 34 | $parser->setHook( 'grammar', array($class, 'grammar') ); |
| 35 | 35 | $parser->setHook( 'plural', array($class, 'plural') ); |
| 36 | 36 | $parser->setHook( 'linktrail', array($class, 'linktrail') ); |
| 37 | | - wfLoadExtensionMessages( 'I18nTags' ); // FOR BC |
| 38 | 37 | $parser->setFunctionHook( 'languagename', array($class, 'languageName' ) ); |
| 39 | 38 | return true; |
| 40 | 39 | } |
| Index: trunk/extensions/UserMerge/UserMerge_body.php |
| — | — | @@ -20,8 +20,6 @@ |
| 21 | 21 | function execute( $par ) { |
| 22 | 22 | global $wgRequest, $wgOut, $wgUser; |
| 23 | 23 | |
| 24 | | - wfLoadExtensionMessages( 'UserMerge' ); |
| 25 | | - |
| 26 | 24 | $this->setHeaders(); |
| 27 | 25 | |
| 28 | 26 | if ( !$wgUser->isAllowed( 'usermerge' ) ) { |
| Index: trunk/extensions/CleanChanges/CleanChanges_body.php |
| — | — | @@ -56,7 +56,6 @@ |
| 57 | 57 | protected $direction = true; |
| 58 | 58 | |
| 59 | 59 | public function __construct( $skin ) { |
| 60 | | - wfLoadExtensionMessages( 'CleanChanges' ); |
| 61 | 60 | global $wgLang; |
| 62 | 61 | parent::__construct( $skin ); |
| 63 | 62 | $this->direction = !$wgLang->isRTL(); |
| Index: trunk/extensions/CleanChanges/Filters.php |
| — | — | @@ -26,7 +26,6 @@ |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | public static function userForm( &$items, $opts ) { |
| 30 | | - wfLoadExtensionMessages( 'CleanChanges' ); |
| 31 | 30 | $opts->consumeValue( 'users' ); |
| 32 | 31 | global $wgRequest; |
| 33 | 32 | |
| — | — | @@ -50,8 +49,6 @@ |
| 51 | 50 | } |
| 52 | 51 | |
| 53 | 52 | public static function trailerForm( &$items, $opts ) { |
| 54 | | - wfLoadExtensionMessages( 'CleanChanges' ); |
| 55 | | - |
| 56 | 53 | $opts->consumeValue( 'trailer' ); |
| 57 | 54 | |
| 58 | 55 | global $wgRequest; |