Merge branch 'dev' into perms

2016-07-13 20:19:11 -07:00
parent 1fd65c934d 00afe56cad
commit 0aa205044b
2 changed files with 6 additions and 5 deletions
--- 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) {