From ae801c6ee356379210843236a9fbed4b464a614b Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 1 Nov 2017 00:26:18 +0100
Subject: [PATCH] Index and construct fixes

---
 includes/current_user.inc | 2 +-
 includes/errors.inc       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 45133344..74a8035f 100644
--- 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 1a66d96f..a4618e8d 100644
--- 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]))
-- 
2.30.2