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

[*] Core: Upgrade smarty to version 3.1.3

Browse Source
This commit is contained in:
rGaillard
2011-10-19 15:16:52 +00:00
parent 978ba64d17
commit 30b74705e7
128 changed files with 24059 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FrontController.php
-7
View File
@@ -103,11 +103,6 @@ class FrontControllerCore extends Controller
Tools::setCookieLanguage($this->context->cookie);
$currency = Tools::setCurrency($this->context->cookie);
if (Validate::isLoadedObject($currency))
$this->context->smarty->ps_currency = $currency;
$this->context->smarty->ps_language = $this->context->language;
$protocol_link = (Configuration::get('PS_SSL_ENABLED') OR Tools::usingSecureMode()) ? 'https://' : 'http://';
$useSSL = ((isset($this->ssl) AND $this->ssl AND Configuration::get('PS_SSL_ENABLED')) OR Tools::usingSecureMode()) ? true : false;
$protocol_content = ($useSSL) ? 'https://' : 'http://';
@@ -209,8 +204,6 @@ class FrontControllerCore extends Controller
setlocale(LC_TIME, $locale);
setlocale(LC_NUMERIC, 'en_US.UTF-8');
$this->context->smarty->ps_language = $this->context->language;
/* get page name to display it in body id */
// @todo check here
$page_name = Dispatcher::getInstance()->getController();
classes/Product.php
+2 -2
View File
@@ -2006,7 +2006,7 @@ class ProductCore extends ObjectModel
*/
public static function convertPrice($params, &$smarty)
{
return Tools::displayPrice($params['price'], $smarty->ps_currency);
return Tools::displayPrice($params['price'], Context::getContext()->currency);
}
/**
@@ -2025,7 +2025,7 @@ class ProductCore extends ObjectModel
public static function displayWtPrice($params, &$smarty)
{
return Tools::displayPrice($params['p'], $smarty->ps_currency);
return Tools::displayPrice($params['p'], Context::getContext()->currency);
}
/**
classes/Tools.php
+1 -1
View File
@@ -472,7 +472,7 @@ class ToolsCore
*/
public static function dateFormat($params, &$smarty)
{
return self::displayDate($params['date'], $smarty->ps_language->id, (isset($params['full']) ? $params['full'] : false));
return self::displayDate($params['date'], Context::getContext()->language->id, (isset($params['full']) ? $params['full'] : false));
}
/**