Index and construct fixes

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 4513334479ae02852a6ede0b8d50c14681d9ad55..74a8035feac3c5b5fc051920689ccb62ccfa3049 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -511,7 +511,7 @@ function user_date_sep()
 {
        global $SysPrefs;
 
-       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->date_sep() : $SysPrefs->dflt_date_sep;
+       return isset($_SESSION["wa_current_user"]->prefs->date_sep) ? $_SESSION["wa_current_user"]->prefs->date_sep() : $SysPrefs->dflt_date_sep;
 }
 
 function user_tho_sep()

diff --git a/includes/errors.inc b/includes/errors.inc
index 1a66d96f701525780a0d9eddd29f32e2f17f86e9..a4618e8d84821bfd0e8ef1211a2aea342284f319 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -32,7 +32,7 @@ function get_backtrace($html = false, $skip=0)
                }
                $str .= $tr['function'].'(';
                
-               if(is_array($tr['args'])) {
+               if(isset($tr['args']) && is_array($tr['args'])) {
                        $args = array();
                        foreach($tr['args'] as $n=>$a) {
                                if (is_object($tr['args'][$n]))