Merge remote-tracking branch 'upstream/dev' into website-import

2016-07-14 22:25:30 -04:00
parent 514ffb74aa 05a9f2f0f5
commit 0edf248cd1
7 changed files with 79 additions and 31 deletions
@@ -98,8 +98,8 @@ function del_aconfig($account_id, $family, $key) {
 }


-function load_abconfig($chan,$xhash) {
-	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) {