From f17005820909d33970b41b543da690407b3923e4 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 24 Feb 2016 17:38:27 +0000
Subject: [PATCH] Mail: Correct `compact()` usage in `wp_mail()`.

Props Ankit K Gupta, maweder.
Fixes #35781 for trunk.
Built from https://develop.svn.wordpress.org/trunk@36688


git-svn-id: http://core.svn.wordpress.org/trunk@36655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/pluggable.php | 2 +-
 wp-includes/version.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 5c467aab0a..8784ed071f 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -478,7 +478,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 		return $phpmailer->Send();
 	} catch ( phpmailerException $e ) {
 
-		$mail_error_data = compact( $to, $subject, $message, $headers, $attachments );
+		$mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
 
 		/**
 		 * Fires after a phpmailerException is caught.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index db175e0435..9c2ce0ed26 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36687';
+$wp_version = '4.5-alpha-36688';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.