[Pkg-owncloud-commits] [owncloud] 421/457: Reintroduce user cache

[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 15ba2a41002d0fb72a5a6ee7f3cb129b03acc4e5
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Jun 15 17:54:48 2015 +0200

    Reintroduce user cache
    
    This was required by avatars and was broken with https://github.com/owncloud/core/pull/16200
    
    Fixes https://github.com/owncloud/core/issues/16942
---
 lib/private/avatar.php | 1 +
 lib/private/server.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index 61a1798..133ab4b 100644
--- a/lib/private/avatar.php
+++ b/lib/private/avatar.php
@@ -90,6 +90,7 @@ class Avatar implements \OCP\IAvatar {
 	 * @return void
 	*/
 	public function set ($data) {
+
 		if($data instanceOf \OCP\IImage) {
 			$img = $data;
 			$data = $img->data();
diff --git a/lib/private/server.php b/lib/private/server.php
index 5ed9d78..f2685bb 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -218,8 +218,8 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('AppHelper', function ($c) {
 			return new \OC\AppHelper();
 		});
-		$this->registerService('NullCache', function ($c) {
-			return new NullCache();
+		$this->registerService('UserCache', function ($c) {
+			return new Cache\File();
 		});
 		$this->registerService('MemCacheFactory', function (Server $c) {
 			$config = $c->getConfig();
@@ -667,7 +667,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
 	 */
 	public function getCache() {
-		return $this->query('NullCache');
+		return $this->query('UserCache');
 	}
 
 	/**

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