FIX Ensure restarting jobs triggers on queue

- Make sure that when a job is resumed it registers it against the queueHandler
  instead of just within the Descriptor class

code/dataobjects/QueuedJobDescriptor.php

@@ -87,7 +87,7 @@ public function resume() {
 			$this->JobStatus = QueuedJob::STATUS_WAIT;
 			$this->ResumeCounts++;
 			$this->write();
-			$this->activateOnQueue();
+			singleton('QueuedJobService')->startJob($this);
 		}
 	}
 

code/services/QueuedJobService.php

@@ -119,16 +119,25 @@ public function queueJob(QueuedJob $job, $startAfter = null, $userId = null, $qu
 
 		$jobDescriptor->write();
 
+		$this->startJob($jobDescriptor, $startAfter);
+
+		return $jobDescriptor->ID;
+	}
+
+	/**
+	 * Start a job (or however the queue handler determines it should be started)
+	 * 
+	 * @param JobDescriptor $jobDescriptor
+	 * @param date $startAfter
+	 */
+	public function startJob($jobDescriptor, $startAfter = null) {
 		if ($startAfter && strtotime($startAfter) > time()) {
 			$this->queueHandler->scheduleJob($jobDescriptor, $startAfter);
 		} else {
 			// immediately start it on the queue, however that works
 			$this->queueHandler->startJobOnQueue($jobDescriptor);
 		}
-
-		return $jobDescriptor->ID;
 	}
-
 
 	/**
 	 * Copies data from a job into a descriptor for persisting