From a0d47f5cf0ca1fc04a5fb1cbb5a0d7363912cad8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Fri, 7 May 2010 15:03:42 +0200 Subject: [PATCH] Cleanup UFCs using dates (use new make_datetime function) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Barrois --- classes/userfilter.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/classes/userfilter.php b/classes/userfilter.php index f95feb9..9362b98 100644 --- a/classes/userfilter.php +++ b/classes/userfilter.php @@ -416,13 +416,7 @@ class UFC_Dead implements UserFilterCondition public function __construct($comparison = null, $date = null) { $this->comparison = $comparison; - if ($date instanceof DateTime) { - $this->date = $date; - } else if (is_int($date)) { - $this->date = new DateTime("@$date"); - } else { - $this->date = new DateTime($date); - } + $this->date = make_datetime($date); } public function buildCondition(PlFilter &$uf) @@ -453,7 +447,7 @@ class UFC_Registered implements UserFilterCondition { $this->active = $active; $this->comparison = $comparison; - $this->date = $date; + $this->date = make_datetime($date); } public function buildCondition(PlFilter &$uf) @@ -465,7 +459,7 @@ class UFC_Registered implements UserFilterCondition $date = 'a.uid IS NOT NULL AND a.state != \'pending\''; } if (!is_null($this->comparison)) { - $date .= ' AND a.registration_date ' . $this->comparison . ' ' . XDB::format('{?}', date('Y-m-d', $this->date)); + $date .= ' AND a.registration_date ' . $this->comparison . ' ' . XDB::format('{?}', $this->date->format('Y-m-d')); } return $date; } -- 2.1.4