[pLog-svn] r4723 - plog/branches/lifetype-1.2/class/action/admin

[oscar at devel.lifetype.net]

Author: oscar
Date: 2007-02-13 06:04:48 -0500 (Tue, 13 Feb 2007)
New Revision: 4723

Modified:
   plog/branches/lifetype-1.2/class/action/admin/adminupdateusersettingsaction.class.php
Log:
Fixed issue 1175 (http://bugs.lifetype.net/view.php?id=1175) -- error message when password does not validate or does not match the second verification password.

Modified: plog/branches/lifetype-1.2/class/action/admin/adminupdateusersettingsaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminupdateusersettingsaction.class.php	2007-02-12 23:45:54 UTC (rev 4722)
+++ plog/branches/lifetype-1.2/class/action/admin/adminupdateusersettingsaction.class.php	2007-02-13 11:04:48 UTC (rev 4723)
@@ -49,18 +49,20 @@
             $this->_userPassword = trim($this->_request->getValue( "userSettingsPassword" ));
             $this->_userConfirmPassword = trim($this->_request->getValue( "confirmPassword" ));
 			
-            $valid = parent::validate();			
+            $valid = parent::validate();		
 
             // check that the password is correct and confirm it
             if( $this->_userPassword != "" ) {
             	$passwordVal = new PasswordValidator();
             	if( !$passwordVal->validate( $this->_userPassword )) {
 					$this->_form->setFieldValidationStatus( "userSettingsPassword", false );					
+					$this->_view = $this->_validationErrorView;
                 	$this->setCommonData( true );
                 	return false;
             	}
             	if( $this->_userPassword != $this->_userConfirmPassword ) {
 					$this->_form->setFieldValidationStatus( "confirmPassword", false );
+					$this->_view = $this->_validationErrorView;					
                 	$this->setCommonData( true );
                 	return false;
             	}