[xoops-svn] SF.net SVN: xoops-svn:[10926] XoopsCore/branches/2.5.x/2.5.6

[<be...@us...>]

Revision: 10926
          http://sourceforge.net/p/xoops/svn/10926
Author:   beckmi
Date:     2013-01-27 09:15:07 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
number of users when "all groups" selected was wrong (tatane/mamba) 

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/main.php

Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2013-01-26 22:04:03 UTC (rev 10925)
+++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2013-01-27 09:15:07 UTC (rev 10926)
@@ -4,8 +4,9 @@
 2013/01/xx: Version 2.5.6 RC1
 ===============================
 Bugfixes:
- - fixed issues with missing xoopscomments table (geekwright/sabahan/Mamba)
- - fixed bug with using reference for non-variables (geekwright/mamba)
+ - issues with missing xoopscomments table (geekwright/sabahan/Mamba)
+ - bug with using reference for non-variables (geekwright/mamba)
+ - number of users when "all groups" selected was wrong (tatane/mamba) 
 
 ===============================
 2013/01/22: Version 2.5.6 Beta
@@ -14,8 +15,8 @@
  - XSS (Cross Site Scripting) vulnerability in Maintenance (Dingjie Yang,Qualys/trabis)
 
 Bugfixes:
- - fixed errors related to static functions, so it works on PHP 5.4 (Mamba)
- - fixed bug #1245 in class XoopsLoad.php (Alain91)
+ - errors related to static functions, so it works on PHP 5.4 (Mamba)
+ - bug #1245 in class XoopsLoad.php (Alain91)
  
 Updated:
  - TinyMCE to 3.5.8 (mamba)

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/main.php	2013-01-26 22:04:03 UTC (rev 10925)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/main.php	2013-01-27 09:15:07 UTC (rev 10926)
@@ -764,8 +764,12 @@
             }
             //print_r($groups);
             $member_handler =& xoops_gethandler('member');
-            $users_count = $member_handler->getUserCountByGroupLink($groups, $criteria);
 
+            if (empty($groups)) {
+                $users_count = $member_handler->getUserCount();
+            } else {
+                $users_count = $member_handler->getUserCountByGroupLink($groups, $criteria);
+            }
             if ( $start < $users_count ) {
                 echo sprintf(_AM_SYSTEM_USERS_USERSFOUND, $users_count)."<br />";
                 $criteria->setSort($sort);