From 2e0eb623850ae4003a566ed56f4be94c1aa166bf Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sat, 30 May 2015 14:17:29 -0400 Subject: Fix bug in calendar condition --- app/Model/Base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Model/Base.php b/app/Model/Base.php index 03d0f8f0..784545fe 100644 --- a/app/Model/Base.php +++ b/app/Model/Base.php @@ -121,7 +121,7 @@ abstract class Base extends \Core\Base "($start_column <= '$start_time' AND ($end_column = '0' OR $end_column IS NULL))", ); - return '('.implode(' OR ', $conditions).')'; + return $start_column.' IS NOT NULL AND '.$start_column.' > 0 AND ('.implode(' OR ', $conditions).')'; } /** -- cgit v1.2.3