From 02e7a8ca0024559b35d21c6d6dc87df52b4899e8 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Fri, 29 Mar 2013 11:37:08 +0100 Subject: [PATCH] [-] BO : Fix bug #PSCFV-8481 no live edit on index when one language is active only --- classes/controller/FrontController.php | 2 +- controllers/admin/AdminModulesPositionsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index 11181cc43..d636b6325 100755 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -398,7 +398,7 @@ class FrontControllerCore extends Controller $this->displayRestrictedCountryPage(); if (Tools::isSubmit('live_edit') && !$this->checkLiveEditAccess()) - die(Tools::displayError()); + Tools::redirect('index.php?controller=404'); $this->iso = $iso; diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php index f614e7755..bb01368cd 100644 --- a/controllers/admin/AdminModulesPositionsController.php +++ b/controllers/admin/AdminModulesPositionsController.php @@ -303,7 +303,7 @@ class AdminModulesPositionsControllerCore extends AdminController { $url = $this->context->shop->getBaseURL().Dispatcher::getInstance()->createUrl('index', (int)$this->context->language->id, $live_edit_params); if (Configuration::get('PS_REWRITING_SETTINGS')) - $url = str_replace('index.php', Language::getIsoById($this->context->employee->id_lang).'/', $url); + $url = str_replace('index.php', ((count(Language::getLanguages(true)) > 1)? Language::getIsoById($this->context->employee->id_lang).'/' : ''), $url); return $url; }