Merge branch 'master' into load-apps-proper-master

Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php

1 files changed, 3 insertions, 3 deletions

diff --git a/cron.php b/cron.php
index 1065a700288..31bc68b08bb 100644
--- a/cron.php
+++ b/cron.php
@@ -51,7 +51,7 @@ try {
 	// load all apps to get all api routes properly setup
 	OC_App::loadApps();
 
-	session_write_close();
+	\OC::$session->close();
 
 	$logger = \OC_Log::$object;
 
@@ -100,7 +100,7 @@ try {
 		touch(TemporaryCronClass::$lockfile);
 
 		// Work
-		$jobList = new \OC\BackgroundJob\JobList();
+		$jobList = \OC::$server->getJobList();
 		$jobs = $jobList->getAll();
 		foreach ($jobs as $job) {
 			$job->execute($jobList, $logger);
@@ -112,7 +112,7 @@ try {
 			OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
 		} else {
 			// Work and success :-)
-			$jobList = new \OC\BackgroundJob\JobList();
+			$jobList = \OC::$server->getJobList();
 			$job = $jobList->getNext();
 			$job->execute($jobList, $logger);
 			$jobList->setLastJob($job);