revert my cruft regarding incremental message cache building, it targetted wrong...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 971bb98..2fb94b9 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -396,7 +396,6 @@ $wgTranslateNumerals = true;
 # Interface messages will be get from the database.
 $wgUseDatabaseMessages = true;
 $wgMsgCacheExpiry      = 86400;
-$wgPartialMessageCache = false;
 
 # Whether to enable language variant conversion. Currently only zh 
 # supports this function, to convert between Traditional and Simplified

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 6433658..8af4484 100755 (executable)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -131,20 +131,10 @@ class MessageCache
         * Loads all or main part of cacheable messages from the database
         */
        function loadFromDB() {
-               global $wgPartialMessageCache;
                $fname = 'MessageCache::loadFromDB';
                $dbr =& wfGetDB( DB_SLAVE );
                $conditions = array( 'page_is_redirect' => 0, 
                                        'page_namespace' => NS_MEDIAWIKI);
-               if ($wgPartialMessageCache) {
-                       wfDebugDieBacktrace( "Confused about how this works." );
-                       if (is_array($wgPartialMessageCache)) {
-                               $conditions['page_title']=$wgPartialMessageCache;
-                       } else {
-                               require_once("MessageCacheHints.php");
-                               $conditions['page_title']=MessageCacheHints::get();
-                       }
-               }
                $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',

diff --git a/includes/MessageCacheHints.php b/includes/MessageCacheHints.php
deleted file mode 100644 (file)
index 70b720f..0000000
--- a/includes/MessageCacheHints.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?
-/**
- * @package MediaWiki
- * @subpackage Cache
- */ 
-
-/** 
- * @package MediaWiki
- *
- * This class should provide methods for message cache key hints for various
- * scopes
- */
-class MessageCacheHints {
-       function get($scope='global') {
-               return array('TODO');
-       }
-}
-?>