[phpwiki-checkins] SF.net SVN: phpwiki:[8695] trunk/lib/plugin/PasswordReset.php

[<var...@us...>]

Revision: 8695
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8695&view=rev
Author:   vargenau
Date:     2012-12-27 19:20:56 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Fix return

Modified Paths:
--------------
    trunk/lib/plugin/PasswordReset.php

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2012-12-27 18:07:00 UTC (rev 8694)
+++ trunk/lib/plugin/PasswordReset.php	2012-12-27 19:20:56 UTC (rev 8695)
@@ -142,9 +142,11 @@
             }
             if ($userid and !empty($post_args['verify'])) {
                 if ($user->isAdmin()) {
-                    return $this->doReset($userid);
+                    $this->doReset($userid);
+                    return '';
                 } else {
-                    return $this->doEmail($request, $userid);
+                    $this->doEmail($request, $userid);
+                    return '';
                 }
             } elseif (empty($post_args['verify'])) {
                 //TODO: verify should check if the user exists, his prefs can be read/safed
@@ -161,7 +163,7 @@
                         $alert = new Alert(_("Already logged in"),
                             HTML(fmt("Changing passwords is done at "), WikiLink(_("UserPreferences"))));
                         $alert->show();
-                        return;
+                        return '';
                     }
                     $thisuser = WikiUser($userid);
                     $prefs = $thisuser->getPreferences();
@@ -173,7 +175,7 @@
                                 fmt("You need to ask an Administrator to reset this password. See below: "),
                                 HTML::br(), WikiLink(ADMIN_USER)));
                         $alert->show();
-                        return;
+                        return '';
                     }
                     $verified = $thisuser->_prefs->_prefs['email']->getraw('emailVerified');
                     if (!$verified)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.