Changes from branches/3.1/wp-includes/pluggable.php at r17386 to trunk/wp-includes/pluggable.php at r18195

File:

• trunk/wp-includes/pluggable.php (modified) (9 diffs)

trunk/wp-includes/pluggable.php

@@ -282 +282 @@
         require_once ABSPATH . WPINC . '/class-phpmailer.php';
         require_once ABSPATH . WPINC . '/class-smtp.php';
-        $phpmailer = new PHPMailer();
+        $phpmailer = new PHPMailer( true );
     }
 
@@ -297 +297 @@
         }
         $headers = array();
+        $cc = array();
+        $bcc = array();
 
         // If it's actually got contents
@@ -401 +403 @@
 
     foreach ( (array) $to as $recipient ) {
-        $phpmailer->AddAddress( trim( $recipient ) );
+        try {
+            // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+            $recipient_name = '';
+            if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                if ( count( $matches ) == 3 ) {
+                    $recipient_name = $matches[1];
+                    $recipient = $matches[2];
+                }
+            }
+            $phpmailer->AddAddress( trim( $recipient ), $recipient_name);
+        } catch ( phpmailerException $e ) {
+            continue;
+        }
     }
 
@@ -411 +425 @@
     if ( !empty( $cc ) ) {
         foreach ( (array) $cc as $recipient ) {
-            $phpmailer->AddCc( trim($recipient) );
+            try {
+                // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+                $recipient_name = '';
+                if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                    if ( count( $matches ) == 3 ) {
+                        $recipient_name = $matches[1];
+                        $recipient = $matches[2];
+                    }
+                }
+                $phpmailer->AddCc( trim($recipient), $recipient_name );
+            } catch ( phpmailerException $e ) {
+                continue;
+            }
         }
     }
@@ -417 +443 @@
     if ( !empty( $bcc ) ) {
         foreach ( (array) $bcc as $recipient) {
-            $phpmailer->AddBcc( trim($recipient) );
+            try {
+                // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+                $recipient_name = '';
+                if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                    if ( count( $matches ) == 3 ) {
+                        $recipient_name = $matches[1];
+                        $recipient = $matches[2];
+                    }
+                }
+                $phpmailer->AddBcc( trim($recipient), $recipient_name );
+            } catch ( phpmailerException $e ) {
+                continue;
+            }
         }
     }
@@ -456 +494 @@
     if ( !empty( $attachments ) ) {
         foreach ( $attachments as $attachment ) {
-            $phpmailer->AddAttachment($attachment);
+            try {
+                $phpmailer->AddAttachment($attachment);
+            } catch ( phpmailerException $e ) {
+                continue;
+            }
         }
     }
@@ -463 +505 @@
 
     // Send!
-    $result = @$phpmailer->Send();
-
-    return $result;
+    try {
+        $phpmailer->Send();
+    } catch ( phpmailerException $e ) {
+        return false;
+    }
+
+    return true;
 }
 endif;
@@ -689 +735 @@
     do_action('set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in');
 
-    // Set httponly if the php version is >= 5.2.0
-    if ( version_compare(phpversion(), '5.2.0', 'ge') ) {
-        setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
-        setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
-        setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-        if ( COOKIEPATH != SITECOOKIEPATH )
-            setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-    } else {
-        $cookie_domain = COOKIE_DOMAIN;
-        if ( !empty($cookie_domain) )
-            $cookie_domain .= '; HttpOnly';
-        setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, $cookie_domain, $secure);
-        setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, $cookie_domain, $secure);
-        setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, $cookie_domain, $secure_logged_in_cookie);
-        if ( COOKIEPATH != SITECOOKIEPATH )
-            setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, $cookie_domain, $secure_logged_in_cookie);
-    }
+    setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
+    setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
+    setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
+    if ( COOKIEPATH != SITECOOKIEPATH )
+        setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
 }
 endif;
@@ -833 +867 @@
  */
 function check_admin_referer($action = -1, $query_arg = '_wpnonce') {
+    if ( -1 == $action )
+        _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2' );
+
     $adminurl = strtolower(admin_url());
     $referer = strtolower(wp_get_referer());