diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/errorhandler.php | 3 | ||||
-rwxr-xr-x | include/functions.php | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/errorhandler.php b/include/errorhandler.php index 8189feafb..f757b68d1 100644 --- a/include/errorhandler.php +++ b/include/errorhandler.php @@ -33,14 +33,13 @@ function format_backtrace($trace) { function ttrss_error_handler($errno, $errstr, $file, $line, $context) { global $logger; - global $last_query; if (error_reporting() == 0 || !$errno) return false; $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1); - if ($last_query) $errstr .= " [Last query: $last_query]"; $context = format_backtrace(debug_backtrace()); + $errstr = truncate_middle($errstr, 16384, " (...) "); if (class_exists("Logger")) return Logger::get()->log_error($errno, $errstr, $file, $line, $context); diff --git a/include/functions.php b/include/functions.php index b558b0e6c..d43943966 100755 --- a/include/functions.php +++ b/include/functions.php @@ -878,6 +878,15 @@ } } + // is not utf8 clean + function truncate_middle($str, $max_len, $suffix = '…') { + if (strlen($str) > $max_len) { + return substr_replace($str, $suffix, $max_len / 2, mb_strlen($str) - $max_len); + } else { + return $str; + } + } + function convert_timestamp($timestamp, $source_tz, $dest_tz) { try { |