[Pkg-owncloud-commits] [owncloud] 12/457: remove file cache remainings from server container
David Prévot
taffit at moszumanska.debian.org
Sun Jun 28 20:05:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit e5a91fc185c4c992469e19d37c4ad3691ed1d3ae
Author: Arthur Schiwon <blizzz at owncloud.com>
Date: Wed May 13 11:58:19 2015 +0200
remove file cache remainings from server container
---
lib/private/server.php | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/private/server.php b/lib/private/server.php
index 7fa668b..f70106b 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -38,13 +38,13 @@ use bantu\IniGetWrapper\IniGetWrapper;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Db\Db;
use OC\AppFramework\Utility\SimpleContainer;
-use OC\Cache\UserCache;
use OC\Command\AsyncBus;
use OC\Diagnostics\NullQueryLogger;
use OC\Diagnostics\EventLogger;
use OC\Diagnostics\QueryLogger;
use OC\Mail\Mailer;
use OC\Memcache\ArrayCache;
+use OC\Memcache\Null as NullCache;
use OC\Http\Client\ClientService;
use OC\Security\CertificateManager;
use OC\Files\Node\Root;
@@ -217,8 +217,8 @@ class Server extends SimpleContainer implements IServerContainer {
$this->registerService('AppHelper', function ($c) {
return new \OC\AppHelper();
});
- $this->registerService('UserCache', function ($c) {
- return new UserCache();
+ $this->registerService('NullCache', function ($c) {
+ return new NullCache();
});
$this->registerService('MemCacheFactory', function (Server $c) {
$config = $c->getConfig();
@@ -646,12 +646,14 @@ class Server extends SimpleContainer implements IServerContainer {
}
/**
- * Returns an ICache instance
+ * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+ * getMemCacheFactory() instead.
*
* @return \OCP\ICache
+ * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
*/
public function getCache() {
- return $this->query('UserCache');
+ return $this->query('NullCache');
}
/**
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list