aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/XConfig.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-20 13:43:36 -0700
committerredmatrix <git@macgirvin.com>2016-06-20 13:43:36 -0700
commit3a43b1d85d12497eeee99ad5948e4ee420809418 (patch)
treeb5158036e1b10961e09d4c6275074c01cc0bf69f /Zotlabs/Lib/XConfig.php
parent01bfadaeaa6440586aba74cf098b38a9a134a510 (diff)
parent670d12219b3afb84b4180a0dae71077dbda4f09d (diff)
downloadvolse-hubzilla-3a43b1d85d12497eeee99ad5948e4ee420809418.tar.gz
volse-hubzilla-3a43b1d85d12497eeee99ad5948e4ee420809418.tar.bz2
volse-hubzilla-3a43b1d85d12497eeee99ad5948e4ee420809418.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Lib/XConfig.php')
-rw-r--r--Zotlabs/Lib/XConfig.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/XConfig.php b/Zotlabs/Lib/XConfig.php
index e28dcf559..7f3d0f2cd 100644
--- a/Zotlabs/Lib/XConfig.php
+++ b/Zotlabs/Lib/XConfig.php
@@ -122,7 +122,7 @@ class XConfig {
);
}
- App::$config[$xchan][$family][$key] = $value;
+ \App::$config[$xchan][$family][$key] = $value;
if($ret)
return $value;
@@ -157,4 +157,4 @@ class XConfig {
return $ret;
}
-} \ No newline at end of file
+}