dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Change 'history-show-deleted' message to 'Revision deleted only' for clarity"
[lhc/web/wiklou.git]
/
includes
/
cache
/
localisation
/
LocalisationCache.php
diff --git
a/includes/cache/localisation/LocalisationCache.php
b/includes/cache/localisation/LocalisationCache.php
index
4970a2b
..
cbff113
100644
(file)
--- a/
includes/cache/localisation/LocalisationCache.php
+++ b/
includes/cache/localisation/LocalisationCache.php
@@
-228,7
+228,7
@@
class LocalisationCache {
}
}
}
}
- wfDebugLog( 'caches',
get_class( $this )
. ": using store $storeClass" );
+ wfDebugLog( 'caches',
static::class
. ": using store $storeClass" );
if ( !empty( $conf['storeDirectory'] ) ) {
$storeConf['directory'] = $conf['storeDirectory'];
}
if ( !empty( $conf['storeDirectory'] ) ) {
$storeConf['directory'] = $conf['storeDirectory'];
}
@@
-313,7
+313,7
@@
class LocalisationCache {
* array.
* @param string $code
* @param string $key
* array.
* @param string $code
* @param string $key
- * @return bool|null|string
+ * @return bool|null|string
|string[]
*/
public function getSubitemList( $code, $key ) {
if ( in_array( $key, self::$splitKeys ) ) {
*/
public function getSubitemList( $code, $key ) {
if ( in_array( $key, self::$splitKeys ) ) {
@@
-549,7
+549,6
@@
class LocalisationCache {
* @return array Array with a 'messages' key, or empty array if the file doesn't exist
*/
public function readJSONFile( $fileName ) {
* @return array Array with a 'messages' key, or empty array if the file doesn't exist
*/
public function readJSONFile( $fileName ) {
-
if ( !is_readable( $fileName ) ) {
return [];
}
if ( !is_readable( $fileName ) ) {
return [];
}
@@
-561,7
+560,6
@@
class LocalisationCache {
$data = FormatJson::decode( $json, true );
if ( $data === null ) {
$data = FormatJson::decode( $json, true );
if ( $data === null ) {
-
throw new MWException( __METHOD__ . ": Invalid JSON file: $fileName" );
}
throw new MWException( __METHOD__ . ": Invalid JSON file: $fileName" );
}
@@
-1036,7
+1034,6
@@
class LocalisationCache {
$blobStore = new MessageBlobStore();
$blobStore->clear();
}
$blobStore = new MessageBlobStore();
$blobStore->clear();
}
-
}
/**
}
/**