Changes in branches/2.2/wp-includes/pluggable.php [5440:5714]

File:

• branches/2.2/wp-includes/pluggable.php (modified) (3 diffs)

branches/2.2/wp-includes/pluggable.php

@@ -157 +157 @@
 endif;
 
-if ( !function_exists('wp_mail') ) :
+if ( !function_exists( 'wp_mail' ) ) :
 function wp_mail($to, $subject, $message, $headers = '') {
     global $phpmailer;
@@ -169 +169 @@
     $mail = compact('to', 'subject', 'message', 'headers');
     $mail = apply_filters('wp_mail', $mail);
-    extract($mail);
+    extract($mail, EXTR_SKIP);
 
     if ( $headers == '' ) {
@@ -224 +224 @@
 function wp_login($username, $password, $already_md5 = false) {
     global $wpdb, $error;
+
+    $username = sanitize_user($username);
 
     if ( '' == $username )