From ae07ee0e4b86f85cea49dc14f45fd3fd04150026 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Wed, 1 Nov 2017 09:54:18 +0100 Subject: [PATCH] More index and constructs fixes. --- includes/current_user.inc | 2 ++ includes/errors.inc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/includes/current_user.inc b/includes/current_user.inc index 74a8035f..e6f05188 100644 --- a/includes/current_user.inc +++ b/includes/current_user.inc @@ -305,6 +305,8 @@ function number_format2($number, $decimals=0) $tsep = $SysPrefs->thoseps[user_tho_sep()]; $dsep = $SysPrefs->decseps[user_dec_sep()]; + if ($number == '') + $number = 0; if($decimals==='max') $dec = 15 - floor(log10(abs($number))); else { diff --git a/includes/errors.inc b/includes/errors.inc index a4618e8d..53587df6 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -21,7 +21,8 @@ function get_backtrace($html = false, $skip=0) foreach($trace as $trn => $tr) { if ($trn <= $skip) continue; if ($html) $str .= ''; - $str .= $tr['file'].':'.$tr['line'].': '; + if (isset($tr['file']) && isset($tr['line'])) + $str .= $tr['file'].':'.$tr['line'].': '; if ($html) $str .= ''; if (isset($tr['type'])) { if($tr['type'] == '::') { -- 2.30.2