diff options
| author | Tom Sommer <tomsommer@users.noreply.github.com> | 2015-07-14 13:17:42 -0400 |
|---|---|---|
| committer | tomsommer <root@tstest.fbhlab.dk> | 2015-07-14 13:18:47 -0400 |
| commit | e37b5f20fb351891536d07b4a1e46cfff56ba25d (patch) | |
| tree | 7f39b39f9432a423003ed2df042c03f20a8338ba | |
| parent | 29f96ab37e3474e2c0ec3b4776b74b071ea755a6 (diff) | |
| download | php-git-e37b5f20fb351891536d07b4a1e46cfff56ba25d.tar.gz | |
Fix rebase error
| -rw-r--r-- | ext/standard/mail.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |