From 0be968c32faf8bbb26f5353e8af6e2169ea2c220 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 5 Aug 2010 10:03:06 +0000 Subject: [PATCH] user_theme() fixed to be used also before login, warning suppressed in array_search_value --- includes/current_user.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/current_user.inc b/includes/current_user.inc index a7a35303..ab5073a6 100644 --- a/includes/current_user.inc +++ b/includes/current_user.inc @@ -353,7 +353,8 @@ function user_dec_sep() function user_theme() { - return $_SESSION["wa_current_user"]->prefs->get_theme(); + return isset($_SESSION["wa_current_user"]) ? + $_SESSION["wa_current_user"]->prefs->get_theme() : 'default'; } function user_pagesize() @@ -469,7 +470,7 @@ function array_append(&$array, $elements) function array_search_value($needle, $haystack, $valuekey=null) { foreach($haystack as $key => $value) { - $val = isset($valuekey) ? $value[$valuekey] : $value; + $val = isset($valuekey) ? @$value[$valuekey] : $value; if ($needle == $val){ return $value; } -- 2.30.2