update
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
<?php
|
||||
/**
|
||||
* 2007-2018 PrestaShop
|
||||
* Copyright since 2007 PrestaShop SA and Contributors
|
||||
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
|
||||
*
|
||||
* NOTICE OF LICENSE
|
||||
*
|
||||
* This source file is subject to the Open Software License (OSL 3.0)
|
||||
* that is bundled with this package in the file LICENSE.txt.
|
||||
* that is bundled with this package in the file LICENSE.md.
|
||||
* It is also available through the world-wide-web at this URL:
|
||||
* https://opensource.org/licenses/OSL-3.0
|
||||
* If you did not receive a copy of the license and are unable to
|
||||
@@ -16,12 +17,11 @@
|
||||
*
|
||||
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
* needs please refer to https://devdocs.prestashop.com/ for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2018 PrestaShop SA
|
||||
* @author PrestaShop SA and Contributors <contact@prestashop.com>
|
||||
* @copyright Since 2007 PrestaShop SA and Contributors
|
||||
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*/
|
||||
define('_PS_SMARTY_DIR_', _PS_VENDOR_DIR_.'prestashop/smarty/');
|
||||
|
||||
@@ -31,7 +31,7 @@ if (Configuration::get('PS_SMARTY_LOCAL')) {
|
||||
} elseif (_PS_MODE_DEV_ && !defined('_PS_ADMIN_DIR_')) {
|
||||
$smarty = new SmartyDev();
|
||||
} else {
|
||||
$smarty = new SmartyBC();
|
||||
$smarty = new Smarty();
|
||||
}
|
||||
|
||||
$smarty->setCompileDir(_PS_CACHE_DIR_.'smarty/compile');
|
||||
@@ -40,7 +40,7 @@ $smarty->use_sub_dirs = true;
|
||||
$smarty->setConfigDir(_PS_SMARTY_DIR_.'configs');
|
||||
$smarty->caching = false;
|
||||
|
||||
if (Configuration::get('PS_SMARTY_CACHING_TYPE') == 'mysql') {
|
||||
if (_PS_SMARTY_CACHING_TYPE_ == 'mysql') {
|
||||
include _PS_CLASS_DIR_.'Smarty/SmartyCacheResourceMysql.php';
|
||||
$smarty->caching_type = 'mysql';
|
||||
}
|
||||
@@ -155,8 +155,10 @@ function smartyHook($params, &$smarty)
|
||||
}
|
||||
}
|
||||
|
||||
unset($hook_params['h']);
|
||||
unset($hook_params['excl']);
|
||||
unset(
|
||||
$hook_params['h'],
|
||||
$hook_params['excl']
|
||||
);
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user