Close #696: Fix member count (Yes, I wanted rev1900)

 ChangeLog           |    3 +++
 modules/xnetgrp.php |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1900 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index fb34772..c88b86f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@ Bug/Wish:
     * Xnet:
         - #694: Color of 'Promotion' groups                                -ALK
 
+    * XnetGrp:
+        - #696: Don't forget non-X when counting members                   -Fru
+
     * XnetEvents:
         - #695: More details about payments                                -Fru
 

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 1d2dba9..3806a46 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -355,7 +355,7 @@ class XnetGrpModule extends PLModule
                                      1, 1)) as letter, COUNT(*)
                            FROM  groupex.membres AS m
                       LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = m.uid)
-                          WHERE  asso_id = {?} and u.perms != \'pending\'
+                          WHERE  asso_id = {?} and (u.perms != \'pending\' OR u.perms IS NULL)
                        GROUP BY  letter
                        ORDER BY  letter', $globals->asso('id'));
         } else {