From debf81d9e2aa376c9ddbb0662dfc915097f00b3a Mon Sep 17 00:00:00 2001
From: reliberate <git@reliberate.com>
Date: Tue, 5 Apr 2016 17:24:22 -0600
Subject: [PATCH] Default/Domain/User Settings: Handle boolean value for
 menu_main_icons setting.

---
 core/default_settings/default_setting_edit.php | 5 ++++-
 core/default_settings/default_settings.php     | 1 +
 core/domain_settings/domain_setting_edit.php   | 5 ++++-
 core/domain_settings/domain_settings.php       | 1 +
 core/users/user_setting_edit.php               | 5 ++++-
 core/users/user_settings.php                   | 1 +
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index a5ba7d4bdd..15f7b9f68a 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -474,7 +474,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
 		echo "    </select>\n";
 	}
-	elseif ($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) {
+	elseif (
+		($category == "theme" && $subcategory == "menu_main_icons" && $name == "boolean") ||
+		($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean")
+		) {
 		echo "	<select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
 		echo "    	<option value='true' ".(($default_setting_value == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
 		echo "    	<option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 3a29169321..1ea99fb6ac 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -414,6 +414,7 @@ else {
 				}
 			}
 			else if (
+				( $category == "theme" && $subcategory == "menu_main_icons" && $name == "boolean" ) ||
 				( $category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) ||
 				( $category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) ||
 				( $category == "theme" && $subcategory == "menu_style" && $name == "text" ) ||
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index cddefb7790..7b04fce86f 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -571,7 +571,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='false' ".(($row['domain_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
 		echo "    </select>\n";
 	}
-	elseif ($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) {
+	elseif (
+		($category == "theme" && $subcategory == "menu_main_icons" && $name == "boolean") ||
+		($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean")
+		) {
 		echo "	<select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
 		echo "    	<option value='true' ".(($row['domain_setting_value'] == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
 		echo "    	<option value='false' ".(($row['domain_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 1765018fdb..4785c72927 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -234,6 +234,7 @@ if (sizeof($_REQUEST) > 1) {
 				}
 			}
 			else if (
+				( $category == "theme" && $subcategory == "menu_main_icons" && $name == "boolean" ) ||
 				( $category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) ||
 				( $category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) ||
 				( $category == "theme" && $subcategory == "menu_style" && $name == "text" ) ||
diff --git a/core/users/user_setting_edit.php b/core/users/user_setting_edit.php
index ebcfe99614..8410080962 100644
--- a/core/users/user_setting_edit.php
+++ b/core/users/user_setting_edit.php
@@ -573,7 +573,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='false' ".(($row['user_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
 		echo "    </select>\n";
 	}
-	elseif ($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) {
+	elseif (
+		($category == "theme" && $subcategory == "menu_main_icons" && $name == "boolean") ||
+		($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean")
+		) {
 		echo "	<select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
 		echo "    	<option value='true' ".(($row['user_setting_value'] == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
 		echo "    	<option value='false' ".(($row['user_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
diff --git a/core/users/user_settings.php b/core/users/user_settings.php
index 97442bb200..752744db82 100644
--- a/core/users/user_settings.php
+++ b/core/users/user_settings.php
@@ -205,6 +205,7 @@ else {
 				}
 			}
 			else if (
+				( $category == "theme" && $subcategory == "menu_main_icons" && $name == "boolean" ) ||
 				( $category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) ||
 				( $category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) ||
 				( $category == "theme" && $subcategory == "menu_style" && $name == "text" ) ||