resolving merge conflict

uwctri · Nov 28, 2022 · eafc88c · eafc88c
2 parents 9459349 + 9e6cb87
commit eafc88c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/StopSurveyEval.php b/StopSurveyEval.php
@@ -62,13 +62,13 @@ public function run_cron($cronInfo)
         // Loop over every pid using this EM
         foreach ($this->getProjectsWithModuleEnabled() as $pid) {
 
-            // Skip if cron feature not enabled
-            if (!$this->getProjectSetting('cron')) continue;
-
             // Act like we are in that project
             $_GET['pid'] = $pid;
             $Proj = new Project($pid);
 
+            // Skip if cron feature not enabled
+            if (!$this->getProjectSetting('cron')) continue;
+
             // Pull records that need eval and go
             $records = array_unique(json_decode($this->getProjectSetting('records'), true));
             if (empty($records)) continue;