Эх сурвалжийг харах

Default/Domain/User Settings: Handle boolean value for menu_main_icons setting.

reliberate 9 жил өмнө
parent
commit
c537bb528e

+ 4 - 1
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";

+ 1 - 0
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" ) ||

+ 4 - 1
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";

+ 1 - 0
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" ) ||

+ 4 - 1
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";

+ 1 - 0
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" ) ||