Merge pull request #154 from stephenmcm/2.10

Fix(Service) ensure run as user is cleared at the end of each runJob
symbiote · Jan 17, 2018 · 0f16f2d · 0f16f2d
2 parents 84cabea + b58f6d0
commit 0f16f2d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ sudo: false
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6

diff --git a/code/services/QueuedJobService.php b/code/services/QueuedJobService.php
@@ -687,8 +687,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);
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ sudo: false @@
     language: php
     php:
-      - 5.3
       - 5.4
       - 5.5
       - 5.6
@@ Expand Down @@