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/AbConfig.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/AbConfig.php')
| -rw-r--r-- | Zotlabs/Lib/AbConfig.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/AbConfig.php b/Zotlabs/Lib/AbConfig.php index cb5d96951..dfc9efc6c 100644 --- a/Zotlabs/Lib/AbConfig.php +++ b/Zotlabs/Lib/AbConfig.php @@ -16,7 +16,7 @@ class AbConfig { } - static public function Get($chan,$xhash,$family,$key) { + static public function Get($chan,$xhash,$family,$key, $default = false) { $r = q("select * from abconfig where chan = %d and xchan = '%s' and cat = '%s' and k = '%s' limit 1", intval($chan), dbesc($xhash), @@ -26,7 +26,7 @@ class AbConfig { if($r) { return ((preg_match('|^a:[0-9]+:{.*}$|s', $r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']); } - return false; + return $default; } |