Merge remote branch 'upstream/master'

1 files changed, 10 insertions, 6 deletions

diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index 8dc0fe7..ae4a8f3 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -200,9 +200,11 @@ function & getUserEntry($name) {
 
 function & getUserEntryByUID($uid) {
 	global $debug, $config;
-	foreach ($config['system']['user'] as & $user)
-		if ($user['uid'] == $uid)
-			return $user;
+
+	if (is_array($config['system']['user']))
+		foreach ($config['system']['user'] as & $user)
+			if ($user['uid'] == $uid)
+				return $user;
 
 	return false;
 }
@@ -215,9 +217,11 @@ function & getGroupEntry($name) {
 
 function & getGroupEntryByGID($gid) {
 	global $debug, $config;
-	foreach ($config['system']['group'] as & $group)
-		if ($group['gid'] == $gid)
-			return $group;
+
+	if (is_array($config['system']['group']))
+		foreach ($config['system']['group'] as & $group)
+			if ($group['gid'] == $gid)
+				return $group;
 
 	return false;
 }