From e37b5f20fb351891536d07b4a1e46cfff56ba25d Mon Sep 17 00:00:00 2001 From: Tom Sommer Date: Tue, 14 Jul 2015 13:17:42 -0400 Subject: [PATCH] Fix rebase error --- ext/standard/mail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.40.0