aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-13 20:19:11 -0700
committerredmatrix <git@macgirvin.com>2016-07-13 20:19:11 -0700
commit0aa205044b195d7ffd378b247bb4f90a9df7645a (patch)
tree0cc6012485cdc8a8e6cf528b693d2e4917de9697 /Zotlabs
parent1fd65c934da1efcbc3e44c5ec1c5112859ba50f9 (diff)
parent00afe56cadbf72bd76efceb0663291d7f88a93fc (diff)
downloadvolse-hubzilla-0aa205044b195d7ffd378b247bb4f90a9df7645a.tar.gz
volse-hubzilla-0aa205044b195d7ffd378b247bb4f90a9df7645a.tar.bz2
volse-hubzilla-0aa205044b195d7ffd378b247bb4f90a9df7645a.zip
Merge branch 'dev' into perms
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/AbConfig.php6
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)
);