| Index: branches/resourceloader/phase3/includes/MessageCache.php |
| — | — | @@ -368,7 +368,7 @@ |
| 369 | 369 | wfProfileIn( __METHOD__ ); |
| 370 | 370 | |
| 371 | 371 | |
| 372 | | - list( , $code ) = $this->figureMessage( $title ); |
| | 372 | + list( $msg, $code ) = $this->figureMessage( $title ); |
| 373 | 373 | |
| 374 | 374 | $cacheKey = wfMemcKey( 'messages', $code ); |
| 375 | 375 | $this->load($code); |
| — | — | @@ -410,6 +410,10 @@ |
| 411 | 411 | $sidebarKey = wfMemcKey( 'sidebar', $code ); |
| 412 | 412 | $parserMemc->delete( $sidebarKey ); |
| 413 | 413 | } |
| | 414 | + |
| | 415 | + // Update the message in the message blob store |
| | 416 | + global $wgContLang; |
| | 417 | + MessageBlobStore::updateMessage( $wgContLang->lcfirst( $msg ) ); |
| 414 | 418 | |
| 415 | 419 | wfRunHooks( "MessageCacheReplace", array( $title, $text ) ); |
| 416 | 420 | |
| — | — | @@ -769,7 +773,7 @@ |
| 770 | 774 | } |
| 771 | 775 | |
| 772 | 776 | public function figureMessage( $key ) { |
| 773 | | - global $wgContLanguageCode; |
| | 777 | + global $wgContLanguageCode, $wgContLang; |
| 774 | 778 | $pieces = explode( '/', $key ); |
| 775 | 779 | if( count( $pieces ) < 2 ) |
| 776 | 780 | return array( $key, $wgContLanguageCode ); |
| Index: branches/resourceloader/phase3/includes/MessageBlobStore.php |
| — | — | @@ -149,14 +149,14 @@ |
| 150 | 150 | |
| 151 | 151 | // Delete old messages, insert new ones |
| 152 | 152 | $dbw->delete( 'msg_resource_links', array( |
| 153 | | - 'mrl_resource' => $resource, |
| | 153 | + 'mrl_resource' => $module, |
| 154 | 154 | 'mrl_message' => $oldMessages |
| 155 | 155 | ), __METHOD__ |
| 156 | 156 | ); |
| 157 | 157 | $newLinksRows = array(); |
| 158 | 158 | foreach ( $newMessages as $message ) { |
| 159 | 159 | $newLinksRows[] = array( |
| 160 | | - 'mrl_resource' => $resource, |
| | 160 | + 'mrl_resource' => $module, |
| 161 | 161 | 'mrl_message' => $message |
| 162 | 162 | ); |
| 163 | 163 | } |