From 3675224eda2f4bdf882189f3fddc9eb357c37203 Mon Sep 17 00:00:00 2001 From: gCharmes Date: Thu, 10 May 2012 17:16:06 +0000 Subject: [PATCH] [-] BO : Add check to avoid redefine _PS_BASE_URL_ on the admin init git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15195 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/init.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/admin-dev/init.php b/admin-dev/init.php index a61da29d7..13205c363 100644 --- a/admin-dev/init.php +++ b/admin-dev/init.php @@ -59,8 +59,10 @@ try $protocol_content = (isset($useSSL) AND $useSSL AND Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://'; $link = new Link($protocol_link, $protocol_content); $context->link = $link; - define('_PS_BASE_URL_', Tools::getShopDomain(true)); - define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true)); + if (!defined('_PS_BASE_URL_')) + define('_PS_BASE_URL_', Tools::getShopDomain(true)); + if (!defined('_PS_BASE_URL_SSL_')) + define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true)); $path = dirname(__FILE__).'/themes/'; // if the current employee theme is not valid (check layout.tpl presence),