[-] 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
This commit is contained in:
1 parent
bbf4d3c1f8
commit
3675224eda
1 file changed
+4
-2
+4
-2
@@ -59,8 +59,10 @@ try
|
|||||||
$protocol_content = (isset($useSSL) AND $useSSL AND Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
|
$protocol_content = (isset($useSSL) AND $useSSL AND Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
|
||||||
$link = new Link($protocol_link, $protocol_content);
|
$link = new Link($protocol_link, $protocol_content);
|
||||||
$context->link = $link;
|
$context->link = $link;
|
||||||
define('_PS_BASE_URL_', Tools::getShopDomain(true));
|
if (!defined('_PS_BASE_URL_'))
|
||||||
define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
|
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/';
|
$path = dirname(__FILE__).'/themes/';
|
||||||
// if the current employee theme is not valid (check layout.tpl presence),
|
// if the current employee theme is not valid (check layout.tpl presence),
|
||||||
|
|||||||
Reference in new issue
Block a user