X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FMessageBlobStore.php;h=635e4337d8c6da7e52c091e09f4d6cdd8332b4e8;hb=ce44cc9d5b6716ce7179cdd67184518c2c10e959;hp=b7c19042ca94031c1f8759eb4af3561f09642e2a;hpb=2e7b7eed40bad1b79ce2f7cfe77df2e2139a20ba;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/resourceloader/MessageBlobStore.php b/includes/resourceloader/MessageBlobStore.php index b7c19042ca..635e4337d8 100644 --- a/includes/resourceloader/MessageBlobStore.php +++ b/includes/resourceloader/MessageBlobStore.php @@ -190,16 +190,18 @@ class MessageBlobStore implements LoggerAwareInterface { * @since 1.27 * @param string $key Message key * @param string $lang Language code - * @return string + * @return string|null */ protected function fetchMessage( $key, $lang ) { $message = wfMessage( $key )->inLanguage( $lang ); - $value = $message->plain(); if ( !$message->exists() ) { $this->logger->warning( 'Failed to find {messageKey} ({lang})', [ 'messageKey' => $key, 'lang' => $lang, ] ); + $value = null; + } else { + $value = $message->plain(); } return $value; } @@ -214,7 +216,10 @@ class MessageBlobStore implements LoggerAwareInterface { private function generateMessageBlob( ResourceLoaderModule $module, $lang ) { $messages = []; foreach ( $module->getMessages() as $key ) { - $messages[$key] = $this->fetchMessage( $key, $lang ); + $value = $this->fetchMessage( $key, $lang ); + if ( $value !== null ) { + $messages[$key] = $value; + } } $json = FormatJson::encode( (object)$messages );