Merge branch '4.2' of github.com:atk4/atk4 into 4.2

atk4 · Mar 14, 2012 · 07cfe1b · 07cfe1b
2 parents 3b35e38 + 5b0a2db
commit 07cfe1b
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/lib/BasicAuth.php b/lib/BasicAuth.php
@@ -317,10 +317,7 @@ function processLogin(){
         $this->api->template->tryDel('Menu');
 		$p=$this->showLoginForm();
 		if($this->form->isSubmitted()){
-			if($this->verifyCredintials(
-						$this->form->get('username'),
-						$this->encryptPassword($this->form->get('password'),$this->form->get('username'))
-						)){
+			if($this->verifyCredintials( $this->form->get('username'), $this->form->get('password'))){				
 				$this->loggedIn($this->form->get('username'),$this->encryptPassword($this->form->get('password')));
 				$this->loginRedirect();
 			}