Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.de

1 files changed, 4 insertions, 3 deletions

diff --git a/protected/models/User.php b/protected/models/User.php
index e601042..76cffe7 100644
--- a/protected/models/User.php
+++ b/protected/models/User.php
@@ -90,12 +90,13 @@ class User extends CActiveRecord
 			$this->created_at = new CDbExpression("NOW()");
 			$this->salt = $this->generateRandomKey();
 			$this->admin_pw_reset = true;
-		}
+		
 		
 		if (!$this->checkPassword($this->password)) {
 			$this->password = $this->encryptPassword($this->password);
-		}
 		
+		}
+		}
 		return parent::beforeSave();
 	}
 
@@ -148,7 +149,7 @@ class User extends CActiveRecord
 	    return $pw;
 	}
 	
-	protected function encryptPassword($password) {
+	public function encryptPassword($password) {
 		return sha1($this->salt.$password);
 	}