| Index: trunk/phase3/includes/MessageBlobStore.php |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | * @return mixed Message blob or false if the module has no messages |
| 68 | 68 | */ |
| 69 | 69 | public static function insertMessageBlob( $name, ResourceLoaderModule $module, $lang ) { |
| 70 | | - $blob = self::generateMessageBlob( $name, $module, $lang ); |
| | 70 | + $blob = self::generateMessageBlob( $module, $lang ); |
| 71 | 71 | |
| 72 | 72 | if ( !$blob ) { |
| 73 | 73 | return false; |
| — | — | @@ -137,7 +137,7 @@ |
| 138 | 138 | |
| 139 | 139 | foreach ( $res as $row ) { |
| 140 | 140 | $oldBlob = $row->mr_blob; |
| 141 | | - $newBlob = self::generateMessageBlob( $name, $module, $row->mr_lang ); |
| | 141 | + $newBlob = self::generateMessageBlob( $module, $row->mr_lang ); |
| 142 | 142 | |
| 143 | 143 | if ( $row->mr_lang === $lang ) { |
| 144 | 144 | $retval = $newBlob; |
| — | — | @@ -330,7 +330,7 @@ |
| 331 | 331 | // older than $wgCacheEpoch |
| 332 | 332 | if ( array_keys( FormatJson::decode( $row->mr_blob, true ) ) !== $module->getMessages() || |
| 333 | 333 | wfTimestamp( TS_MW, $row->mr_timestamp ) <= $wgCacheEpoch ) { |
| 334 | | - $retval[$row->mr_resource] = self::updateModule( $row->mr_resource, $lang ); |
| | 334 | + $retval[$row->mr_resource] = self::updateModule( $module, $lang ); |
| 335 | 335 | } else { |
| 336 | 336 | $retval[$row->mr_resource] = $row->mr_blob; |
| 337 | 337 | } |
| — | — | @@ -345,7 +345,7 @@ |
| 346 | 346 | * @param $lang string Language code |
| 347 | 347 | * @return string JSON object |
| 348 | 348 | */ |
| 349 | | - private static function generateMessageBlob( $name, ResourceLoaderModule $module, $lang ) { |
| | 349 | + private static function generateMessageBlob( ResourceLoaderModule $module, $lang ) { |
| 350 | 350 | $messages = array(); |
| 351 | 351 | |
| 352 | 352 | foreach ( $module->getMessages() as $key ) { |