From eeecf770e052f6866f005a66f6c8385d0173fe3c Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Wed, 21 May 2014 05:52:39 +0000
Subject: [PATCH] Fix the per user language user_setting so that it is only
 applied if it has a value

---
 resources/check_auth.php | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/resources/check_auth.php b/resources/check_auth.php
index f553e3cc91..9ab27d53c1 100644
--- a/resources/check_auth.php
+++ b/resources/check_auth.php
@@ -334,21 +334,23 @@ require_once "resources/require.php";
 					$name = $row['user_setting_name'];
 					$category = $row['user_setting_category'];
 					$subcategory = $row['user_setting_subcategory'];
-					if (strlen($subcategory) == 0) {
-						//$$category[$name] = $row['domain_setting_value'];
-						if ($name == "array") {
-							$_SESSION[$category][] = $row['user_setting_value'];
-						}
-						else {
-							$_SESSION[$category][$name] = $row['user_setting_value'];
-						}
-					} else {
-						//$$category[$subcategory][$name] = $row['domain_setting_value'];
-						if ($name == "array") {
-							$_SESSION[$category][$subcategory][] = $row['user_setting_value'];
-						}
-						else {
-							$_SESSION[$category][$subcategory][$name] = $row['user_setting_value'];
+					if (strlen($row['user_setting_value']) > 0) {
+						if (strlen($subcategory) == 0) {
+							//$$category[$name] = $row['domain_setting_value'];
+							if ($name == "array") {
+								$_SESSION[$category][] = $row['user_setting_value'];
+							}
+							else {
+								$_SESSION[$category][$name] = $row['user_setting_value'];
+							}
+						} else {
+							//$$category[$subcategory][$name] = $row['domain_setting_value'];
+							if ($name == "array") {
+								$_SESSION[$category][$subcategory][] = $row['user_setting_value'];
+							}
+							else {
+								$_SESSION[$category][$subcategory][$name] = $row['user_setting_value'];
+							}
 						}
 					}
 				}