diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-13 20:19:11 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-13 20:19:11 -0700 |
| commit | 0aa205044b195d7ffd378b247bb4f90a9df7645a (patch) | |
| tree | 0cc6012485cdc8a8e6cf528b693d2e4917de9697 | |
| parent | 1fd65c934da1efcbc3e44c5ec1c5112859ba50f9 (diff) | |
| parent | 00afe56cadbf72bd76efceb0663291d7f88a93fc (diff) | |
| download | volse-hubzilla-0aa205044b195d7ffd378b247bb4f90a9df7645a.tar.gz volse-hubzilla-0aa205044b195d7ffd378b247bb4f90a9df7645a.tar.bz2 volse-hubzilla-0aa205044b195d7ffd378b247bb4f90a9df7645a.zip | |
Merge branch 'dev' into perms
| -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) { |