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

[*] CORE : Throw Exception when no theme selected

Browse Source
This commit is contained in:
gRoussac
2013-11-28 15:32:19 +01:00
parent e722a5c817
commit 336e784ca5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/exception/PrestaShopException.php
+3 -2
View File
@@ -66,14 +66,15 @@ class PrestaShopExceptionCore extends Exception
echo '<b>'.((isset($trace['class'])) ? $trace['class'] : '').((isset($trace['type'])) ? $trace['type'] : '').$trace['function'].'</b>';
echo ' - <a href="#" style="font-size: 12px; color: #000000" onclick="document.getElementById(\'psTrace_'.$id.'\').style.display = (document.getElementById(\'psTrace_'.$id.'\').style.display != \'block\') ? \'block\' : \'none\'; return false">[line '.$current_line.' - '.$relative_file.']</a>';
if (count($trace['args']))
if (isset($trace['args']) && count($trace['args']))
echo ' - <a href="#" onclick="document.getElementById(\'psArgs_'.$id.'\').style.display = (document.getElementById(\'psArgs_'.$id.'\').style.display != \'block\') ? \'block\' : \'none\'; return false">['.count($trace['args']).' Arguments]</a>';
else
echo ' - <span style="font-size: 12px;">[0 Argument]</a>';
if ($relative_file)
$this->displayFileDebug($trace['file'], $trace['line'], $id);
$this->displayArgsDebug($trace['args'], $id);
if (isset($trace['args']) && count($trace['args']))
$this->displayArgsDebug($trace['args'], $id);
echo '</li>';
}
echo '</ul>';
config/config.inc.php
+3 -1
View File
@@ -93,13 +93,15 @@ $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');
}
catch (PrestaShopException $e)
{
$e->displayMessage();
}
define('_THEME_NAME_', $context->shop->getTheme());
define('_THEME_NAME_', $theme_name);
define('__PS_BASE_URI__', $context->shop->getBaseURI());
/* Include all defines related to base uri and theme name */