From cd147490559c8537a95e9042b2b020d72282d551 Mon Sep 17 00:00:00 2001 From: fBrignoli Date: Tue, 31 Jul 2012 08:40:16 +0000 Subject: [PATCH] [-] FO : Bug Fixed #PSCFV-3407 - Only index page allows an empty url_rewrite git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16616 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Dispatcher.php | 6 ------ controllers/admin/AdminMetaController.php | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php index 070fc58d4..2f849cc22 100644 --- a/classes/Dispatcher.php +++ b/classes/Dispatcher.php @@ -413,12 +413,6 @@ class DispatcherCore { if ($row['url_rewrite']) $this->addRoute($row['page'], $row['url_rewrite'], $row['page'], $row['id_lang']); - else - $this->empty_route = array( - 'routeID' => $row['page'], - 'rule' => '', - 'controller' => $row['page'], - ); } // Set default empty route if no empty route (that's weird I know) diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index bc1accd14..74b99411d 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -310,7 +310,8 @@ class AdminMetaControllerCore extends AdminController { if (Tools::isSubmit('submitAddmeta')) { - $langs = Language::getLanguages(true); + $langs = Language::getLanguages(false); + $default_language = Configuration::get('PS_LANG_DEFAULT'); if (Tools::getValue('page') != 'index') { @@ -339,6 +340,7 @@ class AdminMetaControllerCore extends AdminController else $_POST['url_rewrite_'.$lang['id_lang']] = Tools::getValue('url_rewrite_1'); } + Hook::exec('actionAdminMetaSave'); } else if (Tools::isSubmit('submitRobots'))