aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/config
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2018-01-25 19:55:31 +0100
committerArthurHoaro <arthur@hoa.ro>2018-01-25 19:55:31 +0100
commitcb4ddbe4e76c81a50748fc3869225f16d9ce13f0 (patch)
treef38f39f42b7b295be3eb3d8c49abcd6461d49bf0 /application/config
parentd449f79a0d7ca808b891baf73b9e25ce7f7e48fe (diff)
downloadShaarli-cb4ddbe4e76c81a50748fc3869225f16d9ce13f0.tar.gz
Shaarli-cb4ddbe4e76c81a50748fc3869225f16d9ce13f0.tar.zst
Shaarli-cb4ddbe4e76c81a50748fc3869225f16d9ce13f0.zip
Fix warnings when upgrading from legacy SebSauvage version
Fixes #1040
Diffstat (limited to 'application/config')
-rw-r--r--application/config/ConfigPhp.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/application/config/ConfigPhp.php b/application/config/ConfigPhp.php
index 2f66e8e0..8add8bcd 100644
--- a/application/config/ConfigPhp.php
+++ b/application/config/ConfigPhp.php
@@ -83,10 +83,10 @@ class ConfigPhp implements ConfigIO
83 83
84 $out = array(); 84 $out = array();
85 foreach (self::$ROOT_KEYS as $key) { 85 foreach (self::$ROOT_KEYS as $key) {
86 $out[$key] = $GLOBALS[$key]; 86 $out[$key] = isset($GLOBALS[$key]) ? $GLOBALS[$key] : '';
87 } 87 }
88 $out['config'] = $GLOBALS['config']; 88 $out['config'] = isset($GLOBALS['config']) ? $GLOBALS['config'] : [];
89 $out['plugins'] = !empty($GLOBALS['plugins']) ? $GLOBALS['plugins'] : array(); 89 $out['plugins'] = isset($GLOBALS['plugins']) ? $GLOBALS['plugins'] : [];
90 return $out; 90 return $out;
91 } 91 }
92 92