From 97ecc657a1af97f1b71d25a2b1bde67c0ae64ad5 Mon Sep 17 00:00:00 2001 From: Mafoo Date: Thu, 1 Jun 2017 17:21:21 +0100 Subject: [PATCH] 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) --- resources/classes/menu.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 39cdffb21f..77d4148577 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -62,6 +62,7 @@ if (!class_exists('menu')) { //restore the menu public function restore() { + //set the variables $db = $this->db; @@ -86,6 +87,9 @@ if (!class_exists('menu')) { $db->beginTransaction(); } + //get the list of languages + $language = new text; + //use the app array to restore the default menu foreach ($apps as $row) { foreach ($row['menu'] as $menu) { @@ -155,7 +159,10 @@ if (!class_exists('menu')) { unset($sql); //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(); $sql = "insert into v_menu_languages "; $sql .= "(";