Merge branch '3.0' into 3.1

symbiote · Mar 14, 2021 · fa720e7 · fa720e7
2 parents 5ecfae1 + 95b26a1
commit fa720e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/services/QueuedJobService.php b/code/services/QueuedJobService.php
@@ -560,7 +560,7 @@ public function runJob($jobId) {
 				// have we stalled at all?
 				$stallCount = 0;
 
-				if ($job->SubsiteID && class_exists('Subsite')) {
+				if (class_exists('Subsite') && $job->SubsiteID) {
 					Subsite::changeSubsite($job->SubsiteID);
 
 					// lets set the base URL as far as Director is concerned so that our URLs are correct

diff --git a/code/tasks/CreateQueuedJobTask.php b/code/tasks/CreateQueuedJobTask.php
@@ -38,7 +38,7 @@ public function run($request) {
 			$now = time();
 			if ($start >= $now) {
 				$friendlyStart = date('Y-m-d H:i:s', $start);
-				echo "Job ".$request['name']. " queued to start at: <b>".$friendlyStart."</b>";
+				echo 'Job queued to start at: <b>' . $friendlyStart . '</b>';
 				singleton('QueuedJobService')->queueJob($job, $start);
 			} else {
 				echo "'start' parameter must be a date/time in the future, parseable with strtotime";