Remove hashing by default for user logins. Auth drivers are now in co…

…ntrol of this behavior. Fixes #3605
kiddivouchers · Jun 27, 2011 · 24073ab · 24073ab
1 parent 8633708
commit 24073ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/classes/kohana/auth.php b/classes/kohana/auth.php
@@ -87,12 +87,6 @@ public function login($username, $password, $remember = FALSE)
 		if (empty($password))
 			return FALSE;
 
-		if (is_string($password))
-		{
-			// Create a hashed password
-			$password = $this->hash($password);
-		}
-
 		return $this->_login($username, $password, $remember);
 	}
 

diff --git a/classes/kohana/auth/file.php b/classes/kohana/auth/file.php
@@ -34,6 +34,12 @@ public function __construct($config = array())
 	 */
 	protected function _login($username, $password, $remember)
 	{
+		if (is_string($password))
+		{
+			// Create a hashed password
+			$password = $this->hash($password);
+		}
+
 		if (isset($this->_users[$username]) AND $this->_users[$username] === $password)
 		{
 			// Complete the login