Add MessageCache::clear and use it on initialise/rebuild of messages

to clear the object cache.

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 8b28aaf..7ff3778 100755 (executable)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -239,5 +239,12 @@ class MessageCache
                        $this->mExtensionMessages[$key] = $value;
                }
        }
+       
+       # Clear all stored messages. Mainly used after a mass rebuild.
+       function clear() {
+               if( $this->mUseCache ) {
+                       $this->mMemc->delete( $this->mMemcKey );
+               }
+       }
 }
 ?>

diff --git a/maintenance/InitialiseMessages.inc b/maintenance/InitialiseMessages.inc
index 3f3dff2..eaf8fdf 100755 (executable)
--- a/maintenance/InitialiseMessages.inc
+++ b/maintenance/InitialiseMessages.inc
@@ -175,11 +175,9 @@ $message
        }
        
        # Clear the relevant memcached key
-       if( $wgUseMemCached ) {
-               print 'Clearing message cache...';
-               $wgMemc->delete( $wgDBname.':messages' );
-               print "Done.\n";
-       }
+       print 'Clearing message cache...';
+       $wgMessageCache->clear();
+       print "Done.\n";
 }
 
 function loadLanguageFile( $filename )