From: Tom Sommer <tomsommer@users.noreply.github.com>
Date: Tue, 14 Jul 2015 17:17:42 +0000 (-0400)
Subject: Fix rebase error
X-Git-Tag: php-7.1.1RC1~35^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e37b5f20fb351891536d07b4a1e46cfff56ba25d;p=php

Fix rebase error
---

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 0b5541e9d9..27d7be60f4 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -294,7 +294,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
 		time(&curtime);
 		date_str = php_format_date("d-M-Y H:i:s e", 13, curtime, 1);
 
-		l = spprintf(&tmp, 0, "[%s] mail() on [%s:%d]: To: %s -- Headers: %s -- Subject: %s\n", date_str->val, zend_get_executed_filename(), zend_get_executed_lineno(), to, hdr ? hdr : "", subject);
+		l = spprintf(&tmp, 0, "[%s] mail() on [%s:%d]: To: %s -- Headers: %s -- Subject: %s\n", ZSTR_VAL(date_str), zend_get_executed_filename(), zend_get_executed_lineno(), to, hdr ? hdr : "", subject);
 
 		zend_string_free(date_str);