Fixed issue #17230: Inconsistent 'willRun' state of the survey when S…

…tart date is undefined
LimeSurvey · Apr 7, 2021 · 32ddd29 · 32ddd29
1 parent 3912d51
commit 32ddd29
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -1122,13 +1122,13 @@ public function getState()
             $sStop   = ($this->expires != '') ? date("Y-m-d H:i:s", strtotime(Yii::app()->getConfig('timeadjust'), strtotime($this->expires))) : null;
             $sStart  = ($this->startdate != '') ? date("Y-m-d H:i:s", strtotime(Yii::app()->getConfig('timeadjust'), strtotime($this->startdate))) : null;
 
-            // Time comparaison
+            // Time comparison
             $oNow   = new DateTime($sNow);
             $oStop  = new DateTime($sStop);
             $oStart = new DateTime($sStart);
 
             $bExpired = (!is_null($sStop) && $oStop < $oNow);
-            $bWillRun = (!is_null($oStart) && $oStart > $oNow);
+            $bWillRun = (!is_null($sStart) && $oStart > $oNow);
 
             if ($bExpired) {
                 return 'expired';
@@ -1137,7 +1137,7 @@ public function getState()
                 // And what happen if $sStop < $sStart : must return something other ?
                 return 'willRun';
             }
-            if(!is_null($sStop)) {
+            if (!is_null($sStop)) {
                 return 'willExpire';
             }
         }