From 9206f62bb8e31f1a1a1b52b18ff77ae7a1c450ae Mon Sep 17 00:00:00 2001
From: Peter Ader <peter.ader@betssongroup.com>
Date: Wed, 4 Jul 2018 13:53:31 +0200
Subject: [PATCH] Fixed bug in date_format modifier, which caused output of
 current timestamp if date is NULL

---
 libs/plugins/modifier.date_format.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/plugins/modifier.date_format.php b/libs/plugins/modifier.date_format.php
index b45b2d4b8..257007480 100644
--- a/libs/plugins/modifier.date_format.php
+++ b/libs/plugins/modifier.date_format.php
@@ -42,9 +42,9 @@ function smarty_modifier_date_format($string, $format = null, $default_date = ''
         }
         $is_loaded = true;
     }
-    if ($string !== '' && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
+    if (!empty($string) && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
         $timestamp = smarty_make_timestamp($string);
-    } elseif ($default_date !== '') {
+    } elseif (!empty($default_date)) {
         $timestamp = smarty_make_timestamp($default_date);
     } else {
         return;