From 96bf40bca34c6f7e3f3be573db24039450328fea Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 8 Mar 2012 16:39:55 +0000 Subject: [PATCH] //small fix --- controllers/admin/AdminModulesPositionsController.php | 6 ++---- themes/live_edit.tpl | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php index 592ca85fe..47b036e7c 100644 --- a/controllers/admin/AdminModulesPositionsController.php +++ b/controllers/admin/AdminModulesPositionsController.php @@ -267,7 +267,7 @@ class AdminModulesPositionsControllerCore extends AdminController 'href' => self::$currentIndex.'&addToHook'.($this->display_key ? '&show_modules='.$this->display_key : '').'&token='.$this->token, 'desc' => $this->l('Transplant a module') ); - + $this->context->smarty->assign(array( 'show_toolbar' => true, 'toolbar_btn' => $this->toolbar_btn, @@ -279,9 +279,7 @@ class AdminModulesPositionsControllerCore extends AdminController 'url_show_invisible' => self::$currentIndex.'&token='.$this->token.'&show_modules='.(int)Tools::getValue('show_modules').'&hook_position=', 'hook_position' => Tools::getValue('hook_position'), 'live_edit' => Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP, - 'url_live_edit' => $this->context->link->getPageLink('index', false, null, - 'live_edit&ad='.$admin_dir.'&liveToken='.sha1($admin_dir._COOKIE_KEY_) - .(Shop::isFeatureActive()?'&id_shop='.Context::getContext()->shop->id : '')), + 'url_live_edit' => $this->context->shop->getBaseUrl().'?live_edit&ad='.$admin_dir.'&liveToken='.sha1($admin_dir._COOKIE_KEY_), 'display_key' => $this->display_key, 'hooks' => $hooks, 'url_submit' => self::$currentIndex.'&token='.$this->token, diff --git a/themes/live_edit.tpl b/themes/live_edit.tpl index 3899a475a..bb9f16c14 100644 --- a/themes/live_edit.tpl +++ b/themes/live_edit.tpl @@ -47,8 +47,8 @@ {/foreach} -
- +
+