diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-20 05:39:08 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-20 05:39:08 -0400 |
| commit | e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272 (patch) | |
| tree | 27bd2e18dddc900edc39f34b47bfea749b3dcf61 /Zotlabs/Lib/AbConfig.php | |
| parent | 50e581d88ad4901b13bbf99b2e58a5787b6bccec (diff) | |
| parent | 9421e42dad0bee6e0aa292d390cf249e1d7f7df4 (diff) | |
| download | volse-hubzilla-e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272.tar.gz volse-hubzilla-e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272.tar.bz2 volse-hubzilla-e0d9d30bcf3b3b8f08bebc3ea6a8bbd20416f272.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'Zotlabs/Lib/AbConfig.php')
| -rw-r--r-- | Zotlabs/Lib/AbConfig.php | 6 |
1 files changed, 4 insertions, 2 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) ); |