From f551917a3ca2cedf748337646ed4b1d398ac8437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 16 Jul 2014 19:40:22 +0200
Subject: kill OC::$session

maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession

restore order os OC::$session and OC::$CLI

remove unneded initialization of dummy session

write back session when $useCustomSession is true

log warning when deprecated app is used
---
 cron.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cron.php')

diff --git a/cron.php b/cron.php
index f0acd2f0492..c48f17ed095 100644
--- a/cron.php
+++ b/cron.php
@@ -56,10 +56,10 @@ try {
 	// load all apps to get all api routes properly setup
 	OC_App::loadApps();
 
-	\OC::$session->close();
+	\OC::$server->getSession()->close();
 
 	// initialize a dummy memory session
-	\OC::$session = new \OC\Session\Memory('');
+	\OC::$server->setSession(new \OC\Session\Memory(''));
 
 	$logger = \OC_Log::$object;
 
-- 
cgit v1.2.3