# can return a cache hit, this saves
# some extra milliseconds
$this->mDeferred = true;
-
+
wfProfileOut( $fname );
}
global $wgAllMessagesEn;
if ( $this->mDisable ) {
- wfDebug( "MessageCache::load(): disabled\n" );
+ static $shownDisabled = false;
+ if ( !$shownDisabled ) {
+ wfDebug( "MessageCache::load(): disabled\n" );
+ $shownDisabled = true;
+ }
return true;
}
$fname = 'MessageCache::load';
wfDebug( "MessageCache::load(): loading all messages\n" );
$this->lock();
# Other threads don't need to load the messages if another thread is doing it.
- $success = $this->mMemc->add( $this->mMemcKey, "loading", MSG_LOAD_TIMEOUT );
+ $success = $this->mMemc->add( $this->mMemcKey.'-status', "loading", MSG_LOAD_TIMEOUT );
if ( $success ) {
wfProfileIn( $fname.'-load' );
$this->loadFromDB();
# Save in memcached
# Keep trying if it fails, this is kind of important
wfProfileIn( $fname.'-save' );
- for ( $i=0; $i<20 && !$this->mMemc->set( $this->mMemcKey, $this->mCache, $this->mExpiry ); $i++ ) {
+ for ($i=0; $i<20 &&
+ !$this->mMemc->set( $this->mMemcKey, $this->mCache, $this->mExpiry );
+ $i++ ) {
usleep(mt_rand(500000,1500000));
}
wfProfileOut( $fname.'-save' );
if ( $i == 20 ) {
- $this->mMemc->set( $this->mMemcKey, 'error', 60*5 );
+ $this->mMemc->set( $this->mMemcKey.'-status', 'error', 60*5 );
wfDebug( "MemCached set error in MessageCache: restart memcached server!\n" );
}
}
function loadFromDB() {
$fname = 'MessageCache::loadFromDB';
$dbr =& wfGetDB( DB_SLAVE );
- $conditions = array( 'page_is_redirect' => 0,
+ $conditions = array( 'page_is_redirect' => 0,
'page_namespace' => NS_MEDIAWIKI);
$res = $dbr->select( array( 'page', 'revision', 'text' ),
array( 'page_title', 'old_text', 'old_flags' ),
}
/**
- * Obsolete
+ * @deprecated
*/
function isCacheable( $key ) {
return true;
}
# If uninitialised, someone is trying to call this halfway through Setup.php
if( !$this->mInitialised ) {
- return "<$key>";
+ return '<' . htmlspecialchars($key) . '>';
}
# If cache initialization was deferred, start it now.
if( $this->mDeferred ) {
!$isfullkey && ($langcode != $wgContLanguageCode) ) {
$message = $this->getFromCache( $lang->ucfirst( $key ) );
}
-
+
# Final fallback
if( !$message ) {
- $message = "<$key>";
+ return '<' . htmlspecialchars($key) . '>';
}
# Replace brace tags
$message = $this->transform( $message );
return $message;
}
-
+
function getFromCache( $title ) {
$message = false;
-
+
# Try the cache
if( $this->mUseCache && is_array( $this->mCache ) && array_key_exists( $title, $this->mCache ) ) {
$message = $this->mCache[$title];
$message = $revision->getText();
if ($this->mUseCache) {
$this->mCache[$title]=$message;
- /* individual messages may be often
- recached until proper purge code exists
+ /* individual messages may be often
+ recached until proper purge code exists
*/
$this->mMemc->set( $this->mMemcKey . ':' . $title, $message, 300 );
}
}
}
-
+
return $message;
}
function disableTransform() { $this->mDisableTransform = true; }
function enableTransform() { $this->mDisableTransform = false; }
+ /**
+ * Add a message to the cache
+ *
+ * @param mixed $key
+ * @param mixed $value
+ */
function addMessage( $key, $value ) {
$this->mExtensionMessages[$key] = $value;
}
+ /**
+ * Add an associative array of message to the cache
+ *
+ * @param array $messages An associative array of key => values to be added
+ */
function addMessages( $messages ) {
foreach ( $messages as $key => $value ) {
$this->mExtensionMessages[$key] = $value;