* (bug 8437) Make Title::loadRestrictions() initialise $mRestrictions properly

[lhc/web/wiklou.git] / includes / MessageCache.php

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 058ada5..dbae08d 100644 (file)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -298,8 +298,6 @@ class MessageCache {
                if ( !$dbr ) {
                        throw new MWException( 'Invalid database object' );
                }
-               $conditions = array( 'page_is_redirect' => 0,
-                                       'page_namespace' => NS_MEDIAWIKI);
                $res = $dbr->select( array( 'page', 'revision', 'text' ),
                        array( 'page_title', 'old_text', 'old_flags' ),
                        'page_is_redirect=0 AND page_namespace='.NS_MEDIAWIKI.' AND page_latest=rev_id AND rev_text_id=old_id',
@@ -315,7 +313,7 @@ class MessageCache {
                # Go through the language array and the extension array and make a note of
                # any keys missing from the cache
                $allMessages = Language::getMessagesFor( 'en' );
-               foreach ( $allMessages as $key => $value ) {
+               foreach ( $allMessages as $key => $unused ) {
                        $uckey = $wgLang->ucfirst( $key );
                        if ( !array_key_exists( $uckey, $this->mCache ) ) {
                                $this->mCache[$uckey] = false;
@@ -326,7 +324,7 @@ class MessageCache {
                MessageCache::loadAllMessages();
 
                # Add them to the cache
-               foreach ( $this->mExtensionMessages as $key => $value ) {
+               foreach ( $this->mExtensionMessages as $key => $unused ) {
                        $uckey = $wgLang->ucfirst( $key );
                        if ( !array_key_exists( $uckey, $this->mCache ) &&
                         ( isset( $this->mExtensionMessages[$key][$wgLang->getCode()] ) || isset( $this->mExtensionMessages[$key]['en'] ) )  ) {
@@ -345,7 +343,7 @@ class MessageCache {
                if ( !$this->mKeys ) {
                        $this->mKeys = array();
                        $allMessages = Language::getMessagesFor( 'en' );
-                       foreach ( $allMessages as $key => $value ) {
+                       foreach ( $allMessages as $key => $unused ) {
                                $title = $wgContLang->ucfirst( $key );
                                array_push( $this->mKeys, $title );
                        }