[geeklog-cvs] geeklog: The number of successfully imported users was always re...

[geeklog-cvs at lists.geeklog.net]

changeset 7994:bb1a6f0be5bb
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/bb1a6f0be5bb
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 30 16:33:10 2010 +0200
description:
The number of successfully imported users was always reported as 0 for the "Batch Add" option in the User Manager (bug #0001211)

diffstat:

 public_html/admin/user.php |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 3d9165bf7921 -r bb1a6f0be5bb public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Oct 30 16:13:57 2010 +0200
+++ b/public_html/admin/user.php	Sat Oct 30 16:33:10 2010 +0200
@@ -2,7 +2,7 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.6                                                               |
+// | Geeklog 1.7                                                               |
 // +---------------------------------------------------------------------------+
 // | user.php                                                                  |
 // |                                                                           |
@@ -1115,11 +1115,12 @@
 
                 $result = USER_createAndSendPassword ($userName, $emailAddr, $uid);
 
-                if ($result && $verbose_import) {
-                    $retval .= "<br" . XHTML . "> Account for <b>$u_name</b> created successfully.<br" . XHTML . ">\n";
-                    COM_errorLog("Account for $u_name created successfully",1);
-                } elseif ($result) {
+                if ($result) {
                     $successes++;
+                    if ($verbose_import) {
+                        $retval .= "<br" . XHTML . "> Account for <b>$u_name</b> created successfully.<br" . XHTML . ">\n";
+                        COM_errorLog("Account for $u_name created successfully",1);
+                    }
                 } else {
                     // user creation failed
                     $retval .= "<br" . XHTML . ">ERROR: There was a problem creating the account for <b>$u_name</b>.<br" . XHTML . ">\n";