[wp-cvs] wordpress/wp-includes functions-user.php,1.3,1.4

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20917/wp-includes

Modified Files:
	functions-user.php 
Log Message:
Automatic login fixes.

Index: functions-user.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-user.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functions-user.php	4 Oct 2004 08:03:50 -0000	1.3
--- functions-user.php	6 Oct 2004 05:31:51 -0000	1.4
***************
*** 3,8 ****
  function login($username, $password, $already_md5 = false) {
  	global $wpdb, $error;
- 	if ( !$already_md5 )
- 		$pwd = md5($password);
  
  	if ( !$username )
--- 3,6 ----
***************
*** 18,26 ****
  	if (!$login) {
  		$error = __('<strong>Error</strong>: Wrong login.');
- 		$pwd = '';
  		return false;
  	} else {
  
! 		if ( $login->user_login == $username && $login->user_pass == $pwd ) {
  			return true;
  		} else {
--- 16,23 ----
  	if (!$login) {
  		$error = __('<strong>Error</strong>: Wrong login.');
  		return false;
  	} else {
  
! 		if ( ($login->user_login == $username && $login->user_pass == $password) || ($already_md5 && $login->user_login == $username && md5($login->user_pass) == $password) ) {
  			return true;
  		} else {