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 /Zotlabs/Lib/AbConfig.php | |
| 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 '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) ); |