Index: branches/5.0.x/core/units/users/users_event_handler.php
===================================================================
diff -u -r12352 -r12365
--- branches/5.0.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 12352)
+++ branches/5.0.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 12365)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 12352 2009-08-19 20:23:37Z dmitrya $
+* @version	$Id: users_event_handler.php 12365 2009-08-22 19:11:51Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1297,17 +1297,17 @@
 
 				if ($user_dummy->GetDBField($status_field) != STATUS_ACTIVE) {
 					// not active user is not allowed to update his record (he could not activate himself manually)
-				return false;
+					return false;
+				}
 			}
-			}
 
 			if ($user_id == -1) {
 				$object =& $event->getObject( Array('skip_autoload' => true) );
 				/* @var $object UsersItem */
 
-			// put salt to user's config
+				// put salt to user's config
 				$field_options = $object->GetFieldOptions('RootPassword');
-			$field_options['salt'] = 'b38';
+				$field_options['salt'] = 'b38';
 				$object->SetFieldOptions('RootPassword', $field_options);
 				$verify_options = $object->GetFieldOptions('VerifyRootPassword');
 				$verify_options['salt'] = 'b38';
@@ -1326,8 +1326,8 @@
 				if ($status) {
 					// validation on, password match too
 					$fields_hash = 	Array (
-											'VariableValue' => $object->GetDBField('RootPassword')
-									);
+						'VariableValue' => $object->GetDBField('RootPassword')
+					);
 					$conf_table = $this->Application->getUnitOption('conf', 'TableName');
 					$this->Conn->doUpdate($fields_hash, $conf_table, 'VariableName = "RootPass"');
 					$event->SetRedirectParam('opener', 'u');
@@ -1341,11 +1341,13 @@
 			else {
 				$object =& $event->getObject();
 				$object->SetFieldsFromHash($field_values);
+
 				if (!$object->Update()) {
 					$event->status = erFAIL;
 					$event->redirect = false;
 				}
 			}
+
 			$event->SetRedirectParam('opener', 'u');
 			$event->redirect == true;
 		}