diff options
| -rw-r--r-- | include/group.php | 7 | ||||
| -rw-r--r-- | include/zot.php | 5 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/include/group.php b/include/group.php index 7ba14a49d..eece07983 100644 --- a/include/group.php +++ b/include/group.php @@ -298,12 +298,13 @@ function expand_groups($a) { if(! (is_array($a) && count($a))) return array(); $x = $a; - stringify_array_elms($x); + stringify_array_elms($x,true); $groups = implode(',', $x); - $groups = dbesc($groups); + if($groups) - $r = q("SELECT xchan FROM group_member WHERE gid IN ( $groups )"); + $r = q("SELECT xchan FROM group_member WHERE gid IN ( select id from `group` where hash in ( $groups ))"); $ret = array(); + if($r) foreach($r as $rr) $ret[] = $rr['xchan']; diff --git a/include/zot.php b/include/zot.php index c4dce5ceb..c7c5c52b7 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1567,6 +1567,11 @@ function import_directory_keywords($hash,$keywords) { function update_modtime($hash,$guid,$addr,$flags = 0) { + $dirmode = intval(get_config('system','directory_mode')); + + if($dirmode == DIRECTORY_MODE_NORMAL) + return; + if($flags) { q("insert into updates (ud_hash, ud_guid, ud_date, ud_flags, ud_addr ) values ( '%s', '%s', '%s', %d, '%s' )", dbesc($hash), diff --git a/version.inc b/version.inc index bd47e9407..812f6d03e 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-04.487 +2013-11-05.488 |