diff options
-rw-r--r-- | Zotlabs/Lib/AbConfig.php | 6 | ||||
-rw-r--r-- | include/config.php | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Zotlabs/Lib/AbConfig.php b/Zotlabs/Lib/AbConfig.php index 138d0dfea..cab59abbd 100644 --- a/Zotlabs/Lib/AbConfig.php +++ b/Zotlabs/Lib/AbConfig.php @@ -5,8 +5,10 @@ namespace Zotlabs\Lib; class AbConfig { - static public function Load($chan,$xhash) { - $r = q("select * from abconfig where chan = %d and xchan = '%s'", + static public function Load($chan,$xhash,$family = '') { + if($family) + $where = sprintf(" and family = '%s' ",dbesc($family)); + $r = q("select * from abconfig where chan = %d and xchan = '%s' $where", intval($chan), dbesc($xhash) ); 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) { |