aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/PConfig.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-12-05 20:16:19 -0500
committerAndrew Manning <tamanning@zoho.com>2016-12-05 20:16:19 -0500
commit8ba5cbc2b99ffed424d085b6365cbc07309ad573 (patch)
tree865cdc545673e1f5781a2ec42dbb6015ac251cf2 /Zotlabs/Lib/PConfig.php
parent3b3da24823defd89f4ed256b7c45df8b71cb0627 (diff)
parentfbf13dde213dcecfdc6c6e5d95b165bb46eda85a (diff)
downloadvolse-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/PConfig.php')
-rw-r--r--Zotlabs/Lib/PConfig.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php
index 3b47a250a..d70697fbc 100644
--- a/Zotlabs/Lib/PConfig.php
+++ b/Zotlabs/Lib/PConfig.php
@@ -67,16 +67,16 @@ class PConfig {
* @return mixed Stored value or false if it does not exist
*/
- static public function Get($uid,$family,$key,$instore = false) {
+ static public function Get($uid,$family,$key,$default = false) {
if(is_null($uid) || $uid === false)
- return false;
+ return $default;
if(! array_key_exists($uid, \App::$config))
self::Load($uid);
if((! array_key_exists($family, \App::$config[$uid])) || (! array_key_exists($key, \App::$config[$uid][$family])))
- return false;
+ return $default;
return ((! is_array(\App::$config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', \App::$config[$uid][$family][$key]))
? unserialize(\App::$config[$uid][$family][$key])