Browse Source

BugFix [master] - menu class (#2622)

when a translation is missing/blank take it from en-us
take the list of lanaguages from text class so all languages get a value
(should fix missing logout button in some languages)
Mafoo 8 years ago
parent
commit
c4925c0a40
1 changed files with 8 additions and 1 deletions
  1. 8 1
      resources/classes/menu.php

+ 8 - 1
resources/classes/menu.php

@@ -62,6 +62,7 @@ if (!class_exists('menu')) {
 
 
 		//restore the menu
 		//restore the menu
 			public function restore() {
 			public function restore() {
+				
 				//set the variables
 				//set the variables
 					$db = $this->db;
 					$db = $this->db;
 
 
@@ -86,6 +87,9 @@ if (!class_exists('menu')) {
 						$db->beginTransaction();
 						$db->beginTransaction();
 					}
 					}
 
 
+				//get the list of languages
+					$language = new text;
+
 				//use the app array to restore the default menu
 				//use the app array to restore the default menu
 					foreach ($apps as $row) {
 					foreach ($apps as $row) {
 						foreach ($row['menu'] as $menu) {
 						foreach ($row['menu'] as $menu) {
@@ -155,7 +159,10 @@ if (!class_exists('menu')) {
 											unset($sql);
 											unset($sql);
 
 
 										//set the menu languages
 										//set the menu languages
-											foreach ($menu["title"] as $menu_language => $menu_item_title) {
+											foreach ($language->languages as $menu_language) {
+												$menu_item_title = $menu["title"][$menu_language];
+												if(strlen($menu_item_title) == 0)
+													$menu_item_title = $menu["title"]['en-us'];
 												$menu_language_uuid = uuid();
 												$menu_language_uuid = uuid();
 												$sql = "insert into v_menu_languages ";
 												$sql = "insert into v_menu_languages ";
 												$sql .= "(";
 												$sql .= "(";