From 8d3c6352a53d725389de634469ca2383a4baa867 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 1 Oct 2017 23:03:41 +0200
Subject: [PATCH] Fixed user config values unavailable error generated before
 user login

---
 includes/current_user.inc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 239324c6..431cfefe 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -683,10 +683,12 @@ function array_append(&$array, $elements)
 //
 function array_search_value($needle, $haystack, $valuekey=null)
 {
-	foreach($haystack as $key => $value) {
-		$val = isset($valuekey) ? @$value[$valuekey] : $value;
-		if ($needle == $val){
-			return $value;
+	if (is_array($haystack)) {
+		foreach($haystack as $key => $value) {
+			$val = isset($valuekey) ? @$value[$valuekey] : $value;
+			if ($needle == $val){
+				return $value;
+			}
 		}
 	}
 	return null;
@@ -698,13 +700,14 @@ function array_search_value($needle, $haystack, $valuekey=null)
 function array_search_keys($needle, $haystack, $valuekey=null)
 {
 	$keys = array();
-	if($haystack)
+	if (is_array($haystack)) {
 		foreach($haystack as $key => $value) {
 			$val = isset($valuekey) ? @$value[$valuekey] : $value;
 			if ($needle == $val){
 				$keys[] = $key;
 			}
 		}
+	}	
 	return $keys;
 }
 //
-- 
2.30.2