[Pkg-owncloud-commits] [owncloud] 09/457: also free joblist and base from file cache code

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit e016ed55ff803f599414f72b7014be0911d95ec4
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Tue May 12 17:44:31 2015 +0200

    also free joblist and base from file cache code
---
 lib/base.php                          | 14 --------------
 lib/private/backgroundjob/joblist.php |  3 ---
 2 files changed, 17 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index a9d582d..c0ee3e8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -652,7 +652,6 @@ class OC {
 			OC_User::setupBackends();
 		}
 
-		self::registerCacheHooks();
 		self::registerFilesystemHooks();
 		if (\OC::$server->getSystemConfig()->getValue('enable_previews', false)) {
 			self::registerPreviewHooks();
@@ -733,19 +732,6 @@ class OC {
 	/**
 	 * register hooks for the cache
 	 */
-	public static function registerCacheHooks() {
-		if (\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) { //don't try to do this before we are properly setup
-			\OCP\BackgroundJob::registerJob('OC\Cache\FileGlobalGC');
-
-			// NOTE: This will be replaced to use OCP
-			$userSession = \OC_User::getUserSession();
-			$userSession->listen('postLogin', '\OC\Cache\File', 'loginListener');
-		}
-	}
-
-	/**
-	 * register hooks for the cache
-	 */
 	public static function registerLogRotate() {
 		$systemConfig = \OC::$server->getSystemConfig();
 		if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index c568873..e8915b4 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -172,9 +172,6 @@ class JobList implements IJobList {
 		/**
 		 * @var Job $job
 		 */
-		if ($class === 'OC_Cache_FileGlobalGC') {
-			$class = '\OC\Cache\FileGlobalGC';
-		}
 		if (!class_exists($class)) {
 			// job from disabled app or old version of an app, no need to do anything
 			return null;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git