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

[*] CORE : Throw Exception when no theme selected only in front office

Browse Source
This commit is contained in:
gRoussac
2013-11-28 16:14:30 +01:00
parent 7261490381
commit d46feffcf1
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
+1 -1
View File
@@ -162,7 +162,7 @@ class FrontControllerCore extends Controller
/* Theme is missing */
if (!is_dir(_PS_THEME_DIR_))
die(sprintf(Tools::displayError('Current theme unavailable "%s". Please check your theme directory name and permissions.'), basename(rtrim(_PS_THEME_DIR_, '/\\'))));
throw new PrestaShopException((sprintf(Tools::displayError('Current theme unavailable "%s". Please check your theme directory name and permissions.'), basename(rtrim(_PS_THEME_DIR_, '/\\')))));
if (Configuration::get('PS_GEOLOCATION_ENABLED'))
if (($newDefault = $this->geolocationManagement($this->context->country)) && Validate::isLoadedObject($newDefault))
config/config.inc.php
+2 -3
View File
@@ -93,14 +93,13 @@ $context = Context::getContext();
try
{
$context->shop = Shop::initialize();
if (Tools::isEmpty($theme_name = $context->shop->getTheme()) || !file_exists(_PS_ALL_THEMES_DIR_.$theme_name))
throw new PrestaShopException('No theme selected');
if (Tools::isEmpty($theme_name = $context->shop->getTheme()) && !defined('_PS_ADMIN_DIR_'))
throw new PrestaShopException(Tools::displayError('Current theme unselected. Please check your theme configuration.'));
}
catch (PrestaShopException $e)
{
$e->displayMessage();
}
define('_THEME_NAME_', $theme_name);
define('__PS_BASE_URI__', $context->shop->getBaseURI());