| Index: trunk/phase3/includes/User.php |
| — | — | @@ -3200,8 +3200,6 @@ |
| 3201 | 3201 | * @return \string Localized descriptive group name |
| 3202 | 3202 | */ |
| 3203 | 3203 | static function getGroupName( $group ) { |
| 3204 | | - global $wgMessageCache; |
| 3205 | | - $wgMessageCache->loadAllMessages(); |
| 3206 | 3204 | $key = "group-$group"; |
| 3207 | 3205 | $name = wfMsg( $key ); |
| 3208 | 3206 | return $name == '' || wfEmptyMsg( $key, $name ) |
| — | — | @@ -3216,8 +3214,6 @@ |
| 3217 | 3215 | * @return \string Localized name for group member |
| 3218 | 3216 | */ |
| 3219 | 3217 | static function getGroupMember( $group ) { |
| 3220 | | - global $wgMessageCache; |
| 3221 | | - $wgMessageCache->loadAllMessages(); |
| 3222 | 3218 | $key = "group-$group-member"; |
| 3223 | 3219 | $name = wfMsg( $key ); |
| 3224 | 3220 | return $name == '' || wfEmptyMsg( $key, $name ) |
| — | — | @@ -3274,8 +3270,6 @@ |
| 3275 | 3271 | * @return \types{\type{Title},\bool} Title of the page if it exists, false otherwise |
| 3276 | 3272 | */ |
| 3277 | 3273 | static function getGroupPage( $group ) { |
| 3278 | | - global $wgMessageCache; |
| 3279 | | - $wgMessageCache->loadAllMessages(); |
| 3280 | 3274 | $page = wfMsgForContent( 'grouppage-' . $group ); |
| 3281 | 3275 | if( !wfEmptyMsg( 'grouppage-' . $group, $page ) ) { |
| 3282 | 3276 | $title = Title::newFromText( $page ); |
| — | — | @@ -3488,8 +3482,6 @@ |
| 3489 | 3483 | * @return \string Localized description of the right |
| 3490 | 3484 | */ |
| 3491 | 3485 | static function getRightDescription( $right ) { |
| 3492 | | - global $wgMessageCache; |
| 3493 | | - $wgMessageCache->loadAllMessages(); |
| 3494 | 3486 | $key = "right-$right"; |
| 3495 | 3487 | $name = wfMsg( $key ); |
| 3496 | 3488 | return $name == '' || wfEmptyMsg( $key, $name ) |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -260,7 +260,6 @@ |
| 261 | 261 | if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { |
| 262 | 262 | # If this is a system message, get the default text. |
| 263 | 263 | list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) ); |
| 264 | | - $wgMessageCache->loadAllMessages( $lang ); |
| 265 | 264 | $text = wfMsgGetKey( $message, false, $lang, false ); |
| 266 | 265 | |
| 267 | 266 | if ( wfEmptyMsg( $message, $text ) ) |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -143,7 +143,6 @@ |
| 144 | 144 | if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { |
| 145 | 145 | # If this is a system message, get the default text. |
| 146 | 146 | list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) ); |
| 147 | | - $wgMessageCache->loadAllMessages( $lang ); |
| 148 | 147 | $text = wfMsgGetKey( $message, false, $lang, false ); |
| 149 | 148 | if( wfEmptyMsg( $message, $text ) ) |
| 150 | 149 | $text = $this->getPreloadedText( $preload ); |
| Index: trunk/phase3/includes/specials/SpecialListgrouprights.php |
| — | — | @@ -41,10 +41,9 @@ |
| 42 | 42 | * Show the special page |
| 43 | 43 | */ |
| 44 | 44 | public function execute( $par ) { |
| 45 | | - global $wgOut, $wgImplicitGroups, $wgMessageCache; |
| | 45 | + global $wgOut, $wgImplicitGroups; |
| 46 | 46 | global $wgGroupPermissions, $wgRevokePermissions, $wgAddGroups, $wgRemoveGroups; |
| 47 | 47 | global $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf; |
| 48 | | - $wgMessageCache->loadAllMessages(); |
| 49 | 48 | |
| 50 | 49 | $this->setHeaders(); |
| 51 | 50 | $this->outputHeader(); |
| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -44,10 +44,8 @@ |
| 45 | 45 | * main() |
| 46 | 46 | */ |
| 47 | 47 | function execute( $par ) { |
| 48 | | - global $wgOut, $wgMessageCache, $wgSpecialVersionShowHooks, $wgContLang; |
| | 48 | + global $wgOut, $wgSpecialVersionShowHooks, $wgContLang; |
| 49 | 49 | |
| 50 | | - $wgMessageCache->loadAllMessages(); |
| 51 | | - |
| 52 | 50 | $this->setHeaders(); |
| 53 | 51 | $this->outputHeader(); |
| 54 | 52 | |
| — | — | @@ -568,4 +566,4 @@ |
| 569 | 567 | } |
| 570 | 568 | } |
| 571 | 569 | |
| 572 | | -} |
| \ No newline at end of file |
| | 570 | +} |
| Index: trunk/phase3/includes/specials/SpecialTags.php |
| — | — | @@ -27,10 +27,8 @@ |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | function execute( $par ) { |
| 31 | | - global $wgOut, $wgMessageCache; |
| | 31 | + global $wgOut; |
| 32 | 32 | |
| 33 | | - $wgMessageCache->loadAllMessages(); |
| 34 | | - |
| 35 | 33 | $wgOut->setPageTitle( wfMsg( 'tags-title' ) ); |
| 36 | 34 | $wgOut->wrapWikiMsg( "<div class='mw-tags-intro'>\n$1\n</div>", 'tags-intro' ); |
| 37 | 35 | |
| — | — | @@ -88,4 +86,4 @@ |
| 89 | 87 | |
| 90 | 88 | return Xml::tags( 'tr', null, $newRow ) . "\n"; |
| 91 | 89 | } |
| 92 | | -} |
| \ No newline at end of file |
| | 90 | +} |
| Index: trunk/phase3/includes/LogPage.php |
| — | — | @@ -147,10 +147,9 @@ |
| 148 | 148 | * @return String: log name |
| 149 | 149 | */ |
| 150 | 150 | public static function logName( $type ) { |
| 151 | | - global $wgLogNames, $wgMessageCache; |
| | 151 | + global $wgLogNames; |
| 152 | 152 | |
| 153 | 153 | if( isset( $wgLogNames[$type] ) ) { |
| 154 | | - $wgMessageCache->loadAllMessages(); |
| 155 | 154 | return str_replace( '_', ' ', wfMsg( $wgLogNames[$type] ) ); |
| 156 | 155 | } else { |
| 157 | 156 | // Bogus log types? Perhaps an extension was removed. |
| — | — | @@ -166,8 +165,7 @@ |
| 167 | 166 | * @return String: headertext of this logtype |
| 168 | 167 | */ |
| 169 | 168 | public static function logHeader( $type ) { |
| 170 | | - global $wgLogHeaders, $wgMessageCache; |
| 171 | | - $wgMessageCache->loadAllMessages(); |
| | 169 | + global $wgLogHeaders; |
| 172 | 170 | return wfMsgExt($wgLogHeaders[$type], array( 'parseinline' ) ); |
| 173 | 171 | } |
| 174 | 172 | |
| — | — | @@ -186,9 +184,8 @@ |
| 187 | 185 | public static function actionText( $type, $action, $title = null, $skin = null, |
| 188 | 186 | $params = array(), $filterWikilinks = false ) |
| 189 | 187 | { |
| 190 | | - global $wgLang, $wgContLang, $wgLogActions, $wgMessageCache; |
| | 188 | + global $wgLang, $wgContLang, $wgLogActions; |
| 191 | 189 | |
| 192 | | - $wgMessageCache->loadAllMessages(); |
| 193 | 190 | $key = "$type/$action"; |
| 194 | 191 | # Defer patrol log to PatrolLog class |
| 195 | 192 | if( $key == 'patrol/patrol' ) { |
| Index: trunk/phase3/includes/RevisionDelete.php |
| — | — | @@ -1302,8 +1302,6 @@ |
| 1303 | 1303 | var $authorNameField = 'log_user_text'; |
| 1304 | 1304 | |
| 1305 | 1305 | public function doQuery( $db ) { |
| 1306 | | - global $wgMessageCache; |
| 1307 | | - $wgMessageCache->loadAllMessages(); |
| 1308 | 1306 | $ids = array_map( 'intval', $this->ids ); |
| 1309 | 1307 | return $db->select( 'logging', '*', |
| 1310 | 1308 | array( 'log_id' => $ids ), |