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

[Matthew Mullenweg]

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

Modified Files:
      Tag: WordPress-Ver-1_2-Branch
	wp-login.php 
Log Message:
Cookie hash fix from Mike, email fix.

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.22.4.3
retrieving revision 1.22.4.4
diff -C2 -d -r1.22.4.3 -r1.22.4.4
*** wp-login.php	6 Oct 2004 00:01:44 -0000	1.22.4.3
--- wp-login.php	6 Oct 2004 04:00:39 -0000	1.22.4.4
***************
*** 33,36 ****
--- 33,43 ----
  }
  
+ function wp_mail($to, $subject, $message, $headers = '', $more = '') {
+ 	if ( function_exists('mb_send_mail') )
+ 		return mb_send_mail($to, $subject, $message, $headers, $more);
+ 	else
+ 		return mail($to, $subject, $message, $headers, $more);
+ }
+ 
  if (!function_exists('add_magic_quotes')) {
  	function add_magic_quotes($array) {
***************
*** 77,82 ****
  case 'logout':
  
!     setcookie('wordpressuser_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
!     setcookie('wordpresspass_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
  	header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
  	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
--- 84,89 ----
  case 'logout':
  
!     setcookie('wordpressuser_' . $cookiehash, ' ', time() - 31536000, COOKIEPATH);
!     setcookie('wordpresspass_' . $cookiehash, ' ', time() - 31536000, COOKIEPATH);
  	header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
  	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
***************
*** 99,103 ****
  	<title>WordPress &raquo; <?php _e('Lost Password') ?></title>
  	<meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
! 	<link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
  	<script type="text/javascript">
  	function focusit() {
--- 106,110 ----
  	<title>WordPress &raquo; <?php _e('Lost Password') ?></title>
  	<meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
! 	<link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
  	<script type="text/javascript">
  	function focusit() {
***************
*** 202,212 ****
  	}
  
! 	if( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) && !empty($_COOKIE['wordpresspass_' . COOKIEHASH]) ) {
! 		$user_login = $_COOKIE['wordpressuser_' . COOKIEHASH];
! 		$user_pass_md5 = $_COOKIE['wordpresspass_' . COOKIEHASH];
  	}
  
  	if ( !login($user_login, $user_pass_md5, true) ) {
! 		if ( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) )
  			$error = 'Your session has expired.';
  	} else {
--- 209,219 ----
  	}
  
! 	if( !empty($_COOKIE['wordpressuser_' . $cookiehash]) && !empty($_COOKIE['wordpresspass_' . $cookiehash]) ) {
! 		$user_login = $_COOKIE['wordpressuser_' . $cookiehash];
! 		$user_pass_md5 = $_COOKIE['wordpresspass_' . $cookiehash];
  	}
  
  	if ( !login($user_login, $user_pass_md5, true) ) {
! 		if ( !empty($_COOKIE['wordpressuser_' . $cookiehash]) )
  			$error = 'Your session has expired.';
  	} else {