diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-14 22:25:30 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-14 22:25:30 -0400 |
| commit | 0edf248cd1f49cb7e4b44744629355e9e165ce64 (patch) | |
| tree | d1b4f0ff41d6879d1bf6814a5e761dd0be51648c /include | |
| parent | 514ffb74aa8457d8dec5c0158550d93d1a18c072 (diff) | |
| parent | 05a9f2f0f58b9ca84e3a286a6126baf9455f947b (diff) | |
| download | volse-hubzilla-0edf248cd1f49cb7e4b44744629355e9e165ce64.tar.gz volse-hubzilla-0edf248cd1f49cb7e4b44744629355e9e165ce64.tar.bz2 volse-hubzilla-0edf248cd1f49cb7e4b44744629355e9e165ce64.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/config.php b/include/config.php index ece22793f..08810e298 100644 --- a/include/config.php +++ b/include/config.php @@ -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) { |