diff --git a/classes/Language.php b/classes/Language.php index 20bee7f45..3584275bf 100644 --- a/classes/Language.php +++ b/classes/Language.php @@ -104,12 +104,12 @@ class LanguageCore extends ObjectModel } /** - * Generate traslations files + * Generate translations files * */ protected function _generateFiles($newIso = null) { - $iso_code = $newIso?$newIso:$this->iso_code; + $iso_code = $newIso ? $newIso : $this->iso_code; if (!file_exists(_PS_TRANSLATIONS_DIR_.$iso_code)) mkdir(_PS_TRANSLATIONS_DIR_.$iso_code); @@ -130,7 +130,6 @@ class LanguageCore extends ObjectModel @chmod($path_file, 0777); } - } /** diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index db9ca1d20..8af34b32b 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -1088,7 +1088,6 @@ class AdminModulesControllerCore extends AdminController $tpl_vars['nameCountryDefault'] = Country::getNameById($this->context->language->id, Configuration::get('PS_COUNTRY_DEFAULT')); $tpl_vars['isoCountryDefault'] = $this->iso_default_country; - $tpl_vars['addonsUrl'] = 'index.php?tab=AdminAddonsMyAccount&token='.Tools::getAdminTokenLite('AdminAddonsMyAccount'); $tpl_vars['categoryFiltered'] = $categoryFiltered; $tpl_vars['modules'] = $modules; diff --git a/install-dev/upgrade/sql/1.5.0.16.sql b/install-dev/upgrade/sql/1.5.0.16.sql index 41cd25e36..6c3f9cff1 100644 --- a/install-dev/upgrade/sql/1.5.0.16.sql +++ b/install-dev/upgrade/sql/1.5.0.16.sql @@ -3,3 +3,8 @@ SET NAMES 'utf8'; ALTER TABLE `PREFIX_order_detail` ADD `id_shop` INT(11) UNSIGNED NOT NULL AFTER `id_warehouse`, ADD INDEX (`id_shop`); UPDATE `PREFIX_order_detail` od SET `id_shop`=(SELECT `id_shop` FROM `PREFIX_orders` WHERE `id_order`=od.`id_order`); + +DELETE FROM `PREFIX_tab` WHERE `class_name` = 'AdminAddonsMyAccount'; +DELETE FROM `PREFIX_tab_lang` WHERE `id_tab` NOT IN (SELECT `id_tab` FROM `PREFIX_tab`); +DELETE FROM `PREFIX_access` WHERE `id_tab` NOT IN (SELECT `id_tab` FROM `PREFIX_tab`); + \ No newline at end of file