Fix warnings when upgrading from legacy SebSauvage version

[github/shaarli/Shaarli.git] / application / config / ConfigPhp.php

diff --git a/application/config/ConfigPhp.php b/application/config/ConfigPhp.php
index 2f66e8e00ac18a537db96d77e2bf66e175c87c29..8add8bcd776009e1cff804f3b8f47e5417ff4c6f 100644 (file)
--- a/application/config/ConfigPhp.php
+++ b/application/config/ConfigPhp.php
@@ -83,10 +83,10 @@ class ConfigPhp implements ConfigIO
 
         $out = array();
         foreach (self::$ROOT_KEYS as $key) {
-            $out[$key] = $GLOBALS[$key];
+            $out[$key] = isset($GLOBALS[$key]) ? $GLOBALS[$key] : '';
         }
-        $out['config'] = $GLOBALS['config'];
-        $out['plugins'] = !empty($GLOBALS['plugins']) ? $GLOBALS['plugins'] : array();
+        $out['config'] = isset($GLOBALS['config']) ? $GLOBALS['config'] : [];
+        $out['plugins'] = isset($GLOBALS['plugins']) ? $GLOBALS['plugins'] : [];
         return $out;
     }