dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : #PSCFV-2211 : Make sure _PS_BASE_URL_ is defined

Browse Source
This commit is contained in:
gCharmes
2012-05-10 16:59:05 +00:00
parent 3a31fc80ad
commit 94723fce40
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cache/class_index.php
Vendored
+10 -15
View File
@@ -1,7 +1,6 @@
<?php return array ( <?php return array (
'AbstractLogger' => 'override/classes/log/AbstractLogger.php', 'AbstractLogger' => 'override/classes/log/AbstractLogger.php',
'AbstractLoggerCore' => 'classes/log/AbstractLogger.php', 'AbstractLoggerCore' => 'classes/log/AbstractLogger.php',
'Accounting' => 'override/classes/Accounting.php',
'Address' => 'override/classes/Address.php', 'Address' => 'override/classes/Address.php',
'AddressController' => 'override/controllers/front/AddressController.php', 'AddressController' => 'override/controllers/front/AddressController.php',
'AddressControllerCore' => 'controllers/front/AddressController.php', 'AddressControllerCore' => 'controllers/front/AddressController.php',
@@ -12,10 +11,6 @@
'AddressesControllerCore' => 'controllers/front/AddressesController.php', 'AddressesControllerCore' => 'controllers/front/AddressesController.php',
'AdminAccessController' => 'override/controllers/admin/AdminAccessController.php', 'AdminAccessController' => 'override/controllers/admin/AdminAccessController.php',
'AdminAccessControllerCore' => 'controllers/admin/AdminAccessController.php', 'AdminAccessControllerCore' => 'controllers/admin/AdminAccessController.php',
'AdminAccountingConfigurationController' => 'override/controllers/admin/AdminAccountingConfigurationController.php',
'AdminAccountingExportController' => 'override/controllers/admin/AdminAccountingExportController.php',
'AdminAccountingManagementController' => 'override/controllers/admin/AdminAccountingManagementController.php',
'AdminAccountingRegisteredNumberController' => 'override/controllers/admin/AdminAccountingRegisteredNumberController.php',
'AdminAddonsCatalogController' => 'override/controllers/admin/AdminAddonsCatalogController.php', 'AdminAddonsCatalogController' => 'override/controllers/admin/AdminAddonsCatalogController.php',
'AdminAddonsCatalogControllerCore' => 'controllers/admin/AdminAddonsCatalogController.php', 'AdminAddonsCatalogControllerCore' => 'controllers/admin/AdminAddonsCatalogController.php',
'AdminAddressesController' => 'override/controllers/admin/AdminAddressesController.php', 'AdminAddressesController' => 'override/controllers/admin/AdminAddressesController.php',
@@ -239,7 +234,7 @@
'CacheXcacheCore' => 'classes/cache/CacheXcache.php', 'CacheXcacheCore' => 'classes/cache/CacheXcache.php',
'Carrier' => 'override/classes/Carrier.php', 'Carrier' => 'override/classes/Carrier.php',
'CarrierCore' => 'classes/Carrier.php', 'CarrierCore' => 'classes/Carrier.php',
'CarrierModule' => 'override/classes/CarrierModule.php', 'CarrierModule' => 'override/classes/module/CarrierModule.php',
'CarrierModuleCore' => 'classes/module/CarrierModule.php', 'CarrierModuleCore' => 'classes/module/CarrierModule.php',
'Cart' => 'override/classes/Cart.php', 'Cart' => 'override/classes/Cart.php',
'CartController' => 'override/controllers/front/CartController.php', 'CartController' => 'override/controllers/front/CartController.php',
@@ -379,7 +374,7 @@
'ImageManagerCore' => 'classes/ImageManager.php', 'ImageManagerCore' => 'classes/ImageManager.php',
'ImageType' => 'override/classes/ImageType.php', 'ImageType' => 'override/classes/ImageType.php',
'ImageTypeCore' => 'classes/ImageType.php', 'ImageTypeCore' => 'classes/ImageType.php',
'ImportModule' => 'override/classes/ImportModule.php', 'ImportModule' => 'override/classes/module/ImportModule.php',
'ImportModuleCore' => 'classes/module/ImportModule.php', 'ImportModuleCore' => 'classes/module/ImportModule.php',
'IndexController' => 'override/controllers/front/IndexController.php', 'IndexController' => 'override/controllers/front/IndexController.php',
'IndexControllerCore' => 'controllers/front/IndexController.php', 'IndexControllerCore' => 'controllers/front/IndexController.php',
@@ -403,19 +398,19 @@
'MessageCore' => 'classes/Message.php', 'MessageCore' => 'classes/Message.php',
'Meta' => 'override/classes/Meta.php', 'Meta' => 'override/classes/Meta.php',
'MetaCore' => 'classes/Meta.php', 'MetaCore' => 'classes/Meta.php',
'Module' => 'override/classes/Module.php', 'Module' => 'override/classes/module/Module.php',
'ModuleAdminController' => 'override/classes/controller/ModuleAdminController.php', 'ModuleAdminController' => 'override/classes/controller/ModuleAdminController.php',
'ModuleAdminControllerCore' => 'classes/controller/ModuleAdminController.php', 'ModuleAdminControllerCore' => 'classes/controller/ModuleAdminController.php',
'ModuleCore' => 'classes/module/Module.php', 'ModuleCore' => 'classes/module/Module.php',
'ModuleFrontController' => 'override/classes/controller/ModuleFrontController.php', 'ModuleFrontController' => 'override/classes/controller/ModuleFrontController.php',
'ModuleFrontControllerCore' => 'classes/controller/ModuleFrontController.php', 'ModuleFrontControllerCore' => 'classes/controller/ModuleFrontController.php',
'ModuleGraph' => 'override/classes/ModuleGraph.php', 'ModuleGraph' => 'override/classes/module/ModuleGraph.php',
'ModuleGraphCore' => 'classes/module/ModuleGraph.php', 'ModuleGraphCore' => 'classes/module/ModuleGraph.php',
'ModuleGraphEngine' => 'override/classes/ModuleGraphEngine.php', 'ModuleGraphEngine' => 'override/classes/module/ModuleGraphEngine.php',
'ModuleGraphEngineCore' => 'classes/module/ModuleGraphEngine.php', 'ModuleGraphEngineCore' => 'classes/module/ModuleGraphEngine.php',
'ModuleGrid' => 'override/classes/ModuleGrid.php', 'ModuleGrid' => 'override/classes/module/ModuleGrid.php',
'ModuleGridCore' => 'classes/module/ModuleGrid.php', 'ModuleGridCore' => 'classes/module/ModuleGrid.php',
'ModuleGridEngine' => 'override/classes/ModuleGridEngine.php', 'ModuleGridEngine' => 'override/classes/module/ModuleGridEngine.php',
'ModuleGridEngineCore' => 'classes/module/ModuleGridEngine.php', 'ModuleGridEngineCore' => 'classes/module/ModuleGridEngine.php',
'MyAccountController' => 'override/controllers/front/MyAccountController.php', 'MyAccountController' => 'override/controllers/front/MyAccountController.php',
'MyAccountControllerCore' => 'controllers/front/MyAccountController.php', 'MyAccountControllerCore' => 'controllers/front/MyAccountController.php',
@@ -515,11 +510,11 @@
'ProfileCore' => 'classes/Profile.php', 'ProfileCore' => 'classes/Profile.php',
'QuickAccess' => 'override/classes/QuickAccess.php', 'QuickAccess' => 'override/classes/QuickAccess.php',
'QuickAccessCore' => 'classes/QuickAccess.php', 'QuickAccessCore' => 'classes/QuickAccess.php',
'Range' => '', 'Range' => 'override/classes/range/Range.php',
'RangeCore' => 'classes/range/Range.php', 'RangeCore' => 'classes/range/Range.php',
'RangePrice' => 'override/classes/RangePrice.php', 'RangePrice' => 'override/classes/range/RangePrice.php',
'RangePriceCore' => 'classes/range/RangePrice.php', 'RangePriceCore' => 'classes/range/RangePrice.php',
'RangeWeight' => 'override/classes/RangeWeight.php', 'RangeWeight' => 'override/classes/range/RangeWeight.php',
'RangeWeightCore' => 'classes/range/RangeWeight.php', 'RangeWeightCore' => 'classes/range/RangeWeight.php',
'Referrer' => 'override/classes/Referrer.php', 'Referrer' => 'override/classes/Referrer.php',
'ReferrerCore' => 'classes/Referrer.php', 'ReferrerCore' => 'classes/Referrer.php',
classes/Link.php
+6 -1
View File
@@ -44,6 +44,11 @@ class LinkCore
$this->url = $_SERVER['SCRIPT_NAME']; $this->url = $_SERVER['SCRIPT_NAME'];
$this->protocol_link = $protocol_link; $this->protocol_link = $protocol_link;
$this->protocol_content = $protocol_content; $this->protocol_content = $protocol_content;
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));
} }
/** /**
@@ -204,7 +209,7 @@ class LinkCore
*/ */
public function getCMSLink($cms, $alias = null, $ssl = false, $id_lang = null) public function getCMSLink($cms, $alias = null, $ssl = false, $id_lang = null)
{ {
$base = (($ssl && Configuration::get('PS_SSL_ENABLED')) ? Tools::getShopDomainSsl(true) : Tools::getShopDomain(true)); $base = (($ssl && Configuration::get('PS_SSL_ENABLED')) ? _PS_BASE_URL_SSL_ : _PS_BASE_URL_);
if (!$id_lang) if (!$id_lang)
$id_lang = Context::getContext()->language->id; $id_lang = Context::getContext()->language->id;