diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-12-05 20:16:19 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-12-05 20:16:19 -0500 |
| commit | 8ba5cbc2b99ffed424d085b6365cbc07309ad573 (patch) | |
| tree | 865cdc545673e1f5781a2ec42dbb6015ac251cf2 /Zotlabs/Lib/Config.php | |
| parent | 3b3da24823defd89f4ed256b7c45df8b71cb0627 (diff) | |
| parent | fbf13dde213dcecfdc6c6e5d95b165bb46eda85a (diff) | |
| download | volse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.tar.gz volse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.tar.bz2 volse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.zip | |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'Zotlabs/Lib/Config.php')
| -rw-r--r-- | Zotlabs/Lib/Config.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Config.php b/Zotlabs/Lib/Config.php index d4ee1aeda..5625a3f79 100644 --- a/Zotlabs/Lib/Config.php +++ b/Zotlabs/Lib/Config.php @@ -98,13 +98,13 @@ class Config { * @return mixed Return value or false on error or if not set */ - static public function Get($family,$key) { + static public function Get($family,$key,$default = false) { if((! array_key_exists($family, \App::$config)) || (! array_key_exists('config_loaded', \App::$config[$family]))) self::Load($family); if(array_key_exists('config_loaded', \App::$config[$family])) { if(! array_key_exists($key, \App::$config[$family])) { - return false; + return $default; } return ((! is_array(\App::$config[$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', \App::$config[$family][$key])) ? unserialize(\App::$config[$family][$key]) @@ -112,7 +112,7 @@ class Config { ); } - return false; + return $default; } /** |