aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/XConfig.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-12-05 14:50:34 -0800
committerzotlabs <mike@macgirvin.com>2016-12-05 14:50:34 -0800
commitfbf13dde213dcecfdc6c6e5d95b165bb46eda85a (patch)
tree61d1e5fef7b9569b71b1a39ea6be5bec35b800d7 /Zotlabs/Lib/XConfig.php
parentbdd713413abaf85f2cb8de86ef9c4032f8a91bd5 (diff)
downloadvolse-hubzilla-fbf13dde213dcecfdc6c6e5d95b165bb46eda85a.tar.gz
volse-hubzilla-fbf13dde213dcecfdc6c6e5d95b165bb46eda85a.tar.bz2
volse-hubzilla-fbf13dde213dcecfdc6c6e5d95b165bb46eda85a.zip
minor changes to config api and markdown_to_bb
Diffstat (limited to 'Zotlabs/Lib/XConfig.php')
-rw-r--r--Zotlabs/Lib/XConfig.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Lib/XConfig.php b/Zotlabs/Lib/XConfig.php
index 7f3d0f2cd..bf78c360f 100644
--- a/Zotlabs/Lib/XConfig.php
+++ b/Zotlabs/Lib/XConfig.php
@@ -59,16 +59,16 @@ class XConfig {
* @return mixed Stored $value or false if it does not exist
*/
- static public function Get($xchan, $family, $key) {
+ static public function Get($xchan, $family, $key, $default = false) {
if(! $xchan)
- return false;
+ return $default;
if(! array_key_exists($xchan, \App::$config))
load_xconfig($xchan);
if((! array_key_exists($family, \App::$config[$xchan])) || (! array_key_exists($key, \App::$config[$xchan][$family])))
- return false;
+ return $default;
return ((! is_array(\App::$config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', \App::$config[$xchan][$family][$key]))
? unserialize(\App::$config[$xchan][$family][$key])