More index and constructs fixes.

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 74a8035feac3c5b5fc051920689ccb62ccfa3049..e6f051885848068c5abe02ef574776594dbff276 100644 (file)
--- 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 a4618e8d84821bfd0e8ef1211a2aea342284f319..53587df6ed081b1489e162d77898d474e48f3ed6 100644 (file)
--- 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 .= '<tr><td>';
-               $str .= $tr['file'].':'.$tr['line'].': ';
+               if (isset($tr['file']) && isset($tr['line']))
+                       $str .= $tr['file'].':'.$tr['line'].': ';
                if ($html) $str .= '</td><td>';
                if (isset($tr['type'])) {
                        if($tr['type'] == '::') {