Index: branches/5.2.x/core/units/helpers/user_helper.php
===================================================================
diff -u -N -r14572 -r14585
--- branches/5.2.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 14572)
+++ branches/5.2.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 14585)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_helper.php 14572 2011-09-20 15:25:49Z alex $
+* @version	$Id: user_helper.php 14585 2011-09-24 12:04:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -29,11 +29,11 @@
 		 * @param string $username
 		 * @param string $password
 		 * @param bool $dry_run
-		 * @param bool $remeber_login
+		 * @param bool $remember_login
 		 * @param string $remember_login_cookie
 		 * @return int
 		 */
-		function loginUser($username, $password, $dry_run = false, $remeber_login = false, $remember_login_cookie = '')
+		function loginUser($username, $password, $dry_run = false, $remember_login = false, $remember_login_cookie = '')
 		{
 			if (!isset($this->event)) {
 				$this->event = new kEvent('u:OnLogin');
@@ -103,10 +103,9 @@
 					if (!$dry_run) {
 						$this->loginUserById($user_id, $remember_login_cookie);
 
-						if ($remeber_login) {
+						if ($remember_login) {
 							// remember username & password when "Remember Login" checkbox us checked (when user is using login form on Front-End)
-		                    $remember_login_cookie = $username . '|' . md5($password);
-							$this->Application->Session->SetCookie('remember_login', $remember_login_cookie, strtotime('+1 month'));
+							$this->Application->Session->SetCookie('remember_login', $username . '|' . md5($password), strtotime('+1 month'));
 						}
 
 						if (!$remember_login_cookie) {
@@ -126,6 +125,8 @@
 					if ($pending_template !== false && !$dry_run) {
 						// when user found, but it's not yet approved redirect hit to notification template
 						$this->event->redirect = $pending_template;
+
+						return LoginResult::OK;
 					}
 					else {
 						// when no notification template given return an error
@@ -238,7 +239,8 @@
 			$this->Application->resetCounters('UserSession');
 			$this->Application->Session->SetCookie('remember_login', '', strtotime('-1 hour'));
 
-			$this->event->SetRedirectParam('pass', 'all');
+			// don't pass user prefix on logout, since resulting url will have broken "env"
+			$this->event->SetRedirectParam('pass', MOD_REWRITE ? 'm' : 'all');
 		}
 
 		/**