Merge branch '3.0' into 3.1

symbiote · Mar 20, 2018 · 047e45e · 047e45e
2 parents 36aa4c1 + d3f7e61
commit 047e45e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/code/services/QueuedJobService.php b/code/services/QueuedJobService.php
@@ -702,8 +702,7 @@ public function runJob($jobId) {
 
 		Config::unnest();
 
-		// okay let's reset our user if we've got an original
-		if ($runAsUser && $originalUser) {
+		if ($runAsUser) {
 			Session::clear("loggedInAs");
 			if ($originalUser) {
 				Session::set("loggedInAs", $originalUser->ID);