fix cron

livestreet · Jan 30, 2017 · e34f7b9 · e34f7b9
1 parent 08f23d0
commit e34f7b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/classes/modules/cron/Cron.class.php b/classes/modules/cron/Cron.class.php
@@ -42,10 +42,10 @@ public function RunMain()
          * TODO: можно сделать выборку нужных задач сразу из БД, а не сравнивать в php время
          */
         $aTasks = $this->GetTaskItemsByFilter(array(
-            'state' => self::TASK_STATE_ACTIVE,
+            'state'  => self::TASK_STATE_ACTIVE,
             '#where' => array(
-                '(t.time_start IS ? OR t.time_start <= ?)' => array(null, date('H:i')),
-                '(t.time_end IS ? OR t.time_end >= ?)' => array(null, date('H:i'))
+                '(t.time_start IS NULL OR t.time_start <= ?)' => array(date('H:i')),
+                '(t.time_end IS NULL OR t.time_end >= ?)'     => array(date('H:i'))
             )
         ));
         $aTasksReady = array();

diff --git a/classes/modules/cron/entity/Task.entity.class.php b/classes/modules/cron/entity/Task.entity.class.php
@@ -93,10 +93,10 @@ public function ValidateStateCheck($sValue, $aParams)
 
     public function ValidateTimesCheck($sValue, $aParams)
     {
-        if ($this->getTimeStart() == '') {
+        if (!$this->getTimeStart()) {
             $this->setTimeStart(null);
         }
-        if ($this->getTimeEnd() == '') {
+        if (!$this->getTimeEnd()) {
             $this->setTimeEnd(null);
         }
         return true;