summaryrefslogtreecommitdiff
path: root/maintenance/getConfiguration.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-12-20 09:00:55 +0100
committerPierre Schmitz <pierre@archlinux.de>2015-12-20 09:00:55 +0100
commita2190ac74dd4d7080b12bab90e552d7aa81209ef (patch)
tree8b31f38de9882d18df54cf8d9e0de74167a094eb /maintenance/getConfiguration.php
parent15e69f7b20b6596b9148030acce5b59993b95a45 (diff)
parent257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff)
Merge branch 'mw-1.26'
Diffstat (limited to 'maintenance/getConfiguration.php')
-rw-r--r--maintenance/getConfiguration.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/maintenance/getConfiguration.php b/maintenance/getConfiguration.php
index d5f68346..58382014 100644
--- a/maintenance/getConfiguration.php
+++ b/maintenance/getConfiguration.php
@@ -184,7 +184,7 @@ class GetConfiguration extends Maintenance {
}
return true;
- } elseif ( is_scalar( $value ) ) {
+ } elseif ( is_scalar( $value ) || $value === null ) {
return true;
}