From e6ed90f56eef19243469dec7b9be6e0b71aa64f4 Mon Sep 17 00:00:00 2001 From: Trevor Parscal Date: Fri, 8 Oct 2010 18:42:20 +0000 Subject: [PATCH] * Improved on r73971 by removing the $name parameter from MessageBlobStore::gerenateMessageBlob, since it was not being used. * Fixed bug introduced in r73971 caused by using a module name rather than a module object in MessageBlobStore::updateModule --- includes/MessageBlobStore.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/MessageBlobStore.php b/includes/MessageBlobStore.php index c5dcff38ca..9d1cdda430 100644 --- a/includes/MessageBlobStore.php +++ b/includes/MessageBlobStore.php @@ -66,7 +66,7 @@ class MessageBlobStore { * @return mixed Message blob or false if the module has no messages */ public static function insertMessageBlob( $name, ResourceLoaderModule $module, $lang ) { - $blob = self::generateMessageBlob( $name, $module, $lang ); + $blob = self::generateMessageBlob( $module, $lang ); if ( !$blob ) { return false; @@ -137,7 +137,7 @@ class MessageBlobStore { foreach ( $res as $row ) { $oldBlob = $row->mr_blob; - $newBlob = self::generateMessageBlob( $name, $module, $row->mr_lang ); + $newBlob = self::generateMessageBlob( $module, $row->mr_lang ); if ( $row->mr_lang === $lang ) { $retval = $newBlob; @@ -330,7 +330,7 @@ class MessageBlobStore { // older than $wgCacheEpoch if ( array_keys( FormatJson::decode( $row->mr_blob, true ) ) !== $module->getMessages() || wfTimestamp( TS_MW, $row->mr_timestamp ) <= $wgCacheEpoch ) { - $retval[$row->mr_resource] = self::updateModule( $row->mr_resource, $lang ); + $retval[$row->mr_resource] = self::updateModule( $module, $lang ); } else { $retval[$row->mr_resource] = $row->mr_blob; } @@ -345,7 +345,7 @@ class MessageBlobStore { * @param $lang string Language code * @return string JSON object */ - private static function generateMessageBlob( $name, ResourceLoaderModule $module, $lang ) { + private static function generateMessageBlob( ResourceLoaderModule $module, $lang ) { $messages = array(); foreach ( $module->getMessages() as $key ) { -- 2.20.1