diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2018-01-31 12:18:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 12:18:31 +0100 |
| commit | 2cbf4acddeeed9d6d775566b1dec560b1452d8eb (patch) | |
| tree | e87aae3178fe88d995c825fef551b9912136e332 /application | |
| parent | 5d924cba648892c2d1e791e6db4dd4e88ac4fdc8 (diff) | |
| parent | cb4ddbe4e76c81a50748fc3869225f16d9ce13f0 (diff) | |
| download | Shaarli-2cbf4acddeeed9d6d775566b1dec560b1452d8eb.tar.gz Shaarli-2cbf4acddeeed9d6d775566b1dec560b1452d8eb.tar.zst Shaarli-2cbf4acddeeed9d6d775566b1dec560b1452d8eb.zip | |
Merge pull request #1063 from ArthurHoaro/hotfix/legacy-warnings
Fix warnings when upgrading from legacy SebSauvage version
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/ConfigPhp.php | 6 |
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 | ||