summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-01-20 20:14:49 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-01-20 20:14:49 +0100
commit9a17006b93a32965842123f6488b3a9f8fd99d97 (patch)
treed6049b8e2b38ba21acb71f10abef1f1b454df146
parent84bb4cc2e9013eb3db8d7114a0e6eb132a723adf (diff)
parent87a754c72ea3414b7c12a30c1538995d4f48de3b (diff)
downloadnextcloud-server-9a17006b93a32965842123f6488b3a9f8fd99d97.tar.gz
nextcloud-server-9a17006b93a32965842123f6488b3a9f8fd99d97.zip
Merge pull request #13506 from owncloud/fix-scanner-s2s-trashbin
avoid $this->cache being null
-rw-r--r--apps/files_sharing/lib/external/storage.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php
index 306a7b8db8a..0d41176e45a 100644
--- a/apps/files_sharing/lib/external/storage.php
+++ b/apps/files_sharing/lib/external/storage.php
@@ -103,7 +103,7 @@ class Storage extends DAV implements ISharedStorage {
}
public function getCache($path = '', $storage = null) {
- if (!$storage) {
+ if (is_null($this->cache)) {
$this->cache = new Cache($this, $this->remote, $this->remoteUser);
}
return $this->cache;