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

// fix norm

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9086 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2011-10-06 09:39:45 +00:00
parent bac1d615cb
commit 6cb41061cf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+3 -1
View File
@@ -481,6 +481,7 @@ class ToolsCore
* @param string $date Date to display format UNIX * @param string $date Date to display format UNIX
* @param integer $id_lang Language id * @param integer $id_lang Language id
* @param boolean $full With time or not (optional) * @param boolean $full With time or not (optional)
* @param string $separator DEPRECATED
* @return string Date * @return string Date
*/ */
public static function displayDate($date, $id_lang, $full = false, $separator = '-') public static function displayDate($date, $id_lang, $full = false, $separator = '-')
@@ -491,7 +492,8 @@ class ToolsCore
die (self::displayError('Invalid date')); die (self::displayError('Invalid date'));
$context = Context::getContext(); $context = Context::getContext();
return date($full ? $context->language->date_format_full : $context->language->date_format_lite, $time); $date_format = ($full ? $context->language->date_format_full : $context->language->date_format_lite);
return date($date_format, $time);
} }
/** /**