aboutsummaryrefslogtreecommitdiffstats
path: root/include/config.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-13 20:19:11 -0700
committerredmatrix <git@macgirvin.com>2016-07-13 20:19:11 -0700
commit0aa205044b195d7ffd378b247bb4f90a9df7645a (patch)
tree0cc6012485cdc8a8e6cf528b693d2e4917de9697 /include/config.php
parent1fd65c934da1efcbc3e44c5ec1c5112859ba50f9 (diff)
parent00afe56cadbf72bd76efceb0663291d7f88a93fc (diff)
downloadvolse-hubzilla-0aa205044b195d7ffd378b247bb4f90a9df7645a.tar.gz
volse-hubzilla-0aa205044b195d7ffd378b247bb4f90a9df7645a.tar.bz2
volse-hubzilla-0aa205044b195d7ffd378b247bb4f90a9df7645a.zip
Merge branch 'dev' into perms
Diffstat (limited to 'include/config.php')
-rw-r--r--include/config.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/config.php b/include/config.php
index 91e021947..8c0469392 100644
--- a/include/config.php
+++ b/include/config.php
@@ -97,9 +97,8 @@ function del_aconfig($account_id, $family, $key) {
return Zlib\AConfig::Delete($account_id, $family, $key);
}
-
-function load_abconfig($chan,$xhash) {
- return Zlib\AbConfig::Load($chan,$xhash);
+function load_abconfig($chan, $xhash, $family = '') {
+ return Zlib\AbConfig::Load($chan,$xhash,$family);
}
function get_abconfig($chan,$xhash,$family,$key) {