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

[-] BO : fixed bug in method displayDate() to the class Tools

Browse Source
This commit is contained in:
lLefevre
2011-10-06 09:17:56 +00:00
parent 69e58a9222
commit 1782dd2c63
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+5 -6
View File
@@ -483,18 +483,17 @@ class ToolsCore
* @param boolean $full With time or not (optional) * @param boolean $full With time or not (optional)
* @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 = '-')
{ {
if (!$date OR !($time = strtotime($date))) if (!$date || !($time = strtotime($date)))
return $date; return $date;
if (!Validate::isDate($date) OR !Validate::isBool($full)) if (!Validate::isDate($date) || !Validate::isBool($full))
die (self::displayError('Invalid date')); die (self::displayError('Invalid date'));
$language = Language::getLanguage((int)$id_lang); $context = Context::getContext();
return date($full ? $language['date_format_full'] : $language['date_format_lite'], $time); return date($full ? $context->language->date_format_full : $context->language->date_format_lite, $time);
} }
/** /**
* Sanitize a string * Sanitize a string
* *