# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1588925329 -32400
# Node ID a8a5e6437f1a69196bdfe7b6e7e54e3b2a6b8c31
# Parent  d9bce34a863ba725e1408b0d84a97c557a0f1d0d
Fix for member listing in group home

diff -r d9bce34a863b -r a8a5e6437f1a s4-funcs.sh
--- a/s4-funcs.sh	Thu May 07 23:03:33 2020 +0900
+++ b/s4-funcs.sh	Fri May 08 17:08:49 2020 +0900
@@ -2216,11 +2216,9 @@
     qtag=`sqlquote "$tag"`
     cond2="tag=$qtag"
   fi
-  if [ -n "$cond1$cond2$3" ]; then
-    cond="$cond1${cond2:+ AND $cond2}${3:+ AND ($3)}"
-    cond=${cond# AND }
-    cond=${cond% AND }
-    cond=${cond:+WHERE $cond}
+  if [ -n "$cond1$cond2" ]; then
+    cond="$cond1${cond2:+ AND $cond2}"
+    cond="WHERE ${cond# AND }"
   fi
 
   # XX: これ複雑すぎるかな。もっとシンプルにしたい。$3条件も。2015-07-08
@@ -2269,7 +2267,7 @@
 			max(case key when 'wtime' then val end) as wtime,
 			max(case key when 'login' then val end) as login
 			from ${tbl}_s group by $nm)
-		b on a.$nm=b.name $cond /* $3 */
+		b on a.$nm=b.name $cond $3
 	order by b.wtime desc, b.login desc,
 	         b.mtime desc, b.tag desc, a.rowid asc"
   # Give precedence to newer maintained groups (2016-09-24)