From 94723fce407aa081cc38edeb9decf2ea7304f5eb Mon Sep 17 00:00:00 2001 From: gCharmes Date: Thu, 10 May 2012 16:59:05 +0000 Subject: [PATCH] [-] FO : #PSCFV-2211 : Make sure _PS_BASE_URL_ is defined --- cache/class_index.php | 25 ++++++++++--------------- classes/Link.php | 7 ++++++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cache/class_index.php b/cache/class_index.php index be55fad6c..f356313b4 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -1,7 +1,6 @@ 'override/classes/log/AbstractLogger.php', 'AbstractLoggerCore' => 'classes/log/AbstractLogger.php', - 'Accounting' => 'override/classes/Accounting.php', 'Address' => 'override/classes/Address.php', 'AddressController' => 'override/controllers/front/AddressController.php', 'AddressControllerCore' => 'controllers/front/AddressController.php', @@ -12,10 +11,6 @@ 'AddressesControllerCore' => 'controllers/front/AddressesController.php', 'AdminAccessController' => 'override/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', 'AdminAddonsCatalogControllerCore' => 'controllers/admin/AdminAddonsCatalogController.php', 'AdminAddressesController' => 'override/controllers/admin/AdminAddressesController.php', @@ -239,7 +234,7 @@ 'CacheXcacheCore' => 'classes/cache/CacheXcache.php', 'Carrier' => 'override/classes/Carrier.php', 'CarrierCore' => 'classes/Carrier.php', - 'CarrierModule' => 'override/classes/CarrierModule.php', + 'CarrierModule' => 'override/classes/module/CarrierModule.php', 'CarrierModuleCore' => 'classes/module/CarrierModule.php', 'Cart' => 'override/classes/Cart.php', 'CartController' => 'override/controllers/front/CartController.php', @@ -379,7 +374,7 @@ 'ImageManagerCore' => 'classes/ImageManager.php', 'ImageType' => 'override/classes/ImageType.php', 'ImageTypeCore' => 'classes/ImageType.php', - 'ImportModule' => 'override/classes/ImportModule.php', + 'ImportModule' => 'override/classes/module/ImportModule.php', 'ImportModuleCore' => 'classes/module/ImportModule.php', 'IndexController' => 'override/controllers/front/IndexController.php', 'IndexControllerCore' => 'controllers/front/IndexController.php', @@ -403,19 +398,19 @@ 'MessageCore' => 'classes/Message.php', 'Meta' => 'override/classes/Meta.php', 'MetaCore' => 'classes/Meta.php', - 'Module' => 'override/classes/Module.php', + 'Module' => 'override/classes/module/Module.php', 'ModuleAdminController' => 'override/classes/controller/ModuleAdminController.php', 'ModuleAdminControllerCore' => 'classes/controller/ModuleAdminController.php', 'ModuleCore' => 'classes/module/Module.php', 'ModuleFrontController' => 'override/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', - 'ModuleGraphEngine' => 'override/classes/ModuleGraphEngine.php', + 'ModuleGraphEngine' => 'override/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', - 'ModuleGridEngine' => 'override/classes/ModuleGridEngine.php', + 'ModuleGridEngine' => 'override/classes/module/ModuleGridEngine.php', 'ModuleGridEngineCore' => 'classes/module/ModuleGridEngine.php', 'MyAccountController' => 'override/controllers/front/MyAccountController.php', 'MyAccountControllerCore' => 'controllers/front/MyAccountController.php', @@ -515,11 +510,11 @@ 'ProfileCore' => 'classes/Profile.php', 'QuickAccess' => 'override/classes/QuickAccess.php', 'QuickAccessCore' => 'classes/QuickAccess.php', - 'Range' => '', + 'Range' => 'override/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', - 'RangeWeight' => 'override/classes/RangeWeight.php', + 'RangeWeight' => 'override/classes/range/RangeWeight.php', 'RangeWeightCore' => 'classes/range/RangeWeight.php', 'Referrer' => 'override/classes/Referrer.php', 'ReferrerCore' => 'classes/Referrer.php', diff --git a/classes/Link.php b/classes/Link.php index 4c6a9f723..9cf98db54 100644 --- a/classes/Link.php +++ b/classes/Link.php @@ -44,6 +44,11 @@ class LinkCore $this->url = $_SERVER['SCRIPT_NAME']; $this->protocol_link = $protocol_link; $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) { - $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) $id_lang = Context::getContext()->language->id;