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

// DisplayDate don't have to 'die' if date == '0000-00-00'

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11344 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-12-19 10:14:42 +00:00
parent 9688e7741f
commit d33fcc2da6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+8 -4
View File
@@ -556,10 +556,14 @@ class ToolsCore
*/ */
public static function displayDate($date, $id_lang, $full = false, $separator = '-') public static function displayDate($date, $id_lang, $full = false, $separator = '-')
{ {
if (!$date || !($time = strtotime($date))) if (!$date || !($time = strtotime($date)))
return $date; return $date;
if ($date == '0000-00-00 00:00:00' || $date == '0000-00-00')
return '';
if (!Validate::isDate($date) || !Validate::isBool($full)) if (!Validate::isDate($date) || !Validate::isBool($full))
die (self::displayError('Invalid date')); throw new PrestashopException('Invalid date');
$context = Context::getContext(); $context = Context::getContext();
$date_format = ($full ? $context->language->date_format_full : $context->language->date_format_lite); $date_format = ($full ? $context->language->date_format_full : $context->language->date_format_lite);
@@ -575,7 +579,7 @@ class ToolsCore
*/ */
public static function safeOutput($string, $html = false) public static function safeOutput($string, $html = false)
{ {
if (!$html) if (!$html)
$string = strip_tags($string); $string = strip_tags($string);
return @Tools::htmlentitiesUTF8($string, ENT_QUOTES); return @Tools::htmlentitiesUTF8($string, ENT_QUOTES);
} }