diff options
author | Aaron Schulz <aschulz@wikimedia.org> | 2018-07-19 17:11:39 +0100 |
---|---|---|
committer | Aaron Schulz <aschulz@wikimedia.org> | 2018-07-19 17:11:39 +0100 |
commit | e4558d4885779ae306f3d4219fd690c7a4ae169b (patch) | |
tree | dedf9a9e97d78bf2c25b902b04ea6deb48964acc /includes/filebackend | |
parent | 1fb12414dba64fbe78bfd63da696a4c0fa4c2c24 (diff) | |
download | mediawikicore-e4558d4885779ae306f3d4219fd690c7a4ae169b.tar.gz mediawikicore-e4558d4885779ae306f3d4219fd690c7a4ae169b.zip |
filebackend: let any specific backend value of "readOnly" override the default
Previously, only different reason strings could override, but there was
no way to override the read-only mode to being off.
Change-Id: I4266694034bfbdada90d4be96bcbc1a37f5b5409
Diffstat (limited to 'includes/filebackend')
-rw-r--r-- | includes/filebackend/FileBackendGroup.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/includes/filebackend/FileBackendGroup.php b/includes/filebackend/FileBackendGroup.php index dc6dbe8f5360..503acdcf4224 100644 --- a/includes/filebackend/FileBackendGroup.php +++ b/includes/filebackend/FileBackendGroup.php @@ -123,9 +123,7 @@ class FileBackendGroup { } $class = $config['class']; - $config['readOnly'] = !empty( $config['readOnly'] ) - ? $config['readOnly'] - : $readOnlyReason; + $config['readOnly'] = $config['readOnly'] ?? $readOnlyReason; unset( $config['class'] ); // backend won't need this $this->backends[$name] = [ |