[wp-cvs] wordpress wp-login.php,1.22.4.4,1.22.4.5

[Matthew Mullenweg]

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

Modified Files:
      Tag: WordPress-Ver-1_2-Branch
	wp-login.php 
Log Message:
Backporting 1.3 fixes.

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.22.4.4
retrieving revision 1.22.4.5
diff -C2 -d -r1.22.4.4 -r1.22.4.5
*** wp-login.php	6 Oct 2004 04:00:39 -0000	1.22.4.4
--- wp-login.php	6 Oct 2004 05:34:29 -0000	1.22.4.5
***************
*** 4,9 ****
  function login($username, $password, $already_md5 = false) {
  	global $wpdb, $error, $tableusers;
- 	if ( !$already_md5 )
- 		$pwd = md5($password);
  
  	if ( !$username )
--- 4,7 ----
***************
*** 23,27 ****
  	} else {
  
! 		if ( $login->user_login == $username && $login->user_pass == $pwd ) {
  			return true;
  		} else {
--- 21,25 ----
  	} else {
  
! 		if ( ($login->user_login == $username && $login->user_pass == $password) || ($already_md5 && $login->user_login == $username && md5($login->user_pass) == $password) ) {
  			return true;
  		} else {
***************
*** 177,181 ****
  	if( !empty($_POST) ) {
  		$log = $_POST['log'];
! 		$pwd = $_POST['pwd'];
  		$redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']);
  	}
--- 175,179 ----
  	if( !empty($_POST) ) {
  		$log = $_POST['log'];
! 		$pwd = md5($_POST['pwd']);
  		$redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']);
  	}
***************
*** 194,198 ****
  	} else {
  		$user_login = $log;
! 		$user_pass = md5($pwd);
  		setcookie('wordpressuser_'.$cookiehash, $user_login, time() + 31536000, COOKIEPATH);
  		setcookie('wordpresspass_'.$cookiehash, md5($user_pass), time() + 31536000, COOKIEPATH);
--- 192,196 ----
  	} else {
  		$user_login = $log;
! 		$user_pass = $pwd;
  		setcookie('wordpressuser_'.$cookiehash, $user_login, time() + 31536000, COOKIEPATH);
  		setcookie('wordpresspass_'.$cookiehash, md5($user_pass), time() + 31536000, COOKIEPATH);