summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2015-12-02 15:05:29 +0100
committerRobin Appelman <icewind@owncloud.com>2016-01-14 12:54:42 +0100
commit5fae07f422eede80d7ace5f909f9f9ea853d7d89 (patch)
tree86c18f69664c2df6aa6a6f1830db2fa9d03a4701 /apps
parent6d321f5f6b4e22f0c8124572662361a1f53e7c3a (diff)
downloadnextcloud-server-5fae07f422eede80d7ace5f909f9f9ea853d7d89.tar.gz
nextcloud-server-5fae07f422eede80d7ace5f909f9f9ea853d7d89.zip
add scanner interface
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/connector/sabre/objecttree.php3
-rw-r--r--apps/files_sharing/lib/scanner.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/dav/lib/connector/sabre/objecttree.php b/apps/dav/lib/connector/sabre/objecttree.php
index ba4c855f58a..55b310a4405 100644
--- a/apps/dav/lib/connector/sabre/objecttree.php
+++ b/apps/dav/lib/connector/sabre/objecttree.php
@@ -135,9 +135,8 @@ class ObjectTree extends \Sabre\DAV\Tree {
/**
* @var \OC\Files\Storage\Storage $storage
*/
- $scanner = $storage->getScanner($internalPath);
// get data directly
- $data = $scanner->getData($internalPath);
+ $data = $storage->getMetaData($internalPath);
$info = new FileInfo($absPath, $storage, $internalPath, $data, $mount);
} else {
$info = null;
diff --git a/apps/files_sharing/lib/scanner.php b/apps/files_sharing/lib/scanner.php
index 1152c49755a..bd6a28a4934 100644
--- a/apps/files_sharing/lib/scanner.php
+++ b/apps/files_sharing/lib/scanner.php
@@ -35,7 +35,7 @@ class SharedScanner extends Scanner {
*
* @return array an array of metadata of the file
*/
- public function getData($path){
+ protected function getData($path){
$data = parent::getData($path);
$sourcePath = $this->storage->getSourcePath($path);
list($sourceStorage, $internalPath) = \OC\Files\Filesystem::resolvePath($sourcePath);