From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 18 Aug 2015 11:59:37 +0000 (+0200)
Subject: Revert fix for nicer truncation on log_errors_max_len
X-Git-Tag: php-7.0.0RC2~2^2~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=501407aa49e4c664381b9849b8385d6ab390b18d;p=php

Revert fix for nicer truncation on log_errors_max_len
---

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 3af0b5ac07..ab0fc73c81 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -1037,7 +1037,7 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */
 		line = zval_get_long(GET_PROPERTY_SILENT(&exception, "line"));
 
 		zend_error_va(severity, (file && ZSTR_LEN(file) > 0) ? ZSTR_VAL(file) : NULL, line,
-			"Uncaught %.*s\n  thrown", PG(log_errors_max_len) ? MIN(ZSTR_LEN(str), MAX(PG(log_errors_max_len) - 18, 0)) : ZSTR_LEN(str), ZSTR_VAL(str));
+			"Uncaught %s\n  thrown", ZSTR_VAL(str));
 
 		zend_string_release(str);
 		zend_string_release(file);