use getUserFolder instead of getFileInfo when constructing FilesHome

Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/9583/head
Robin Appelman 8 years ago
parent fd4a7bf72a
commit 51724a35a4
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
  1. 9
      apps/dav/lib/Files/FilesHome.php
  2. 7
      apps/dav/lib/Files/RootCollection.php

@ -39,15 +39,12 @@ class FilesHome extends Directory {
* FilesHome constructor.
*
* @param array $principalInfo
* @param FileInfo $userFolder
*/
public function __construct($principalInfo) {
public function __construct($principalInfo, FileInfo $userFolder) {
$this->principalInfo = $principalInfo;
$view = \OC\Files\Filesystem::getView();
$rootInfo = $view->getFileInfo('');
if (!($rootInfo instanceof FileInfo)) {
throw new \Exception('Home does not exist');
}
parent::__construct($view, $rootInfo);
parent::__construct($view, $userFolder);
}
function delete() {

@ -23,6 +23,7 @@
*/
namespace OCA\DAV\Files;
use OCP\Files\FileInfo;
use Sabre\DAV\INode;
use Sabre\DAVACL\AbstractPrincipalCollection;
use Sabre\DAV\SimpleCollection;
@ -48,7 +49,11 @@ class RootCollection extends AbstractPrincipalCollection {
// in the future this could be considered to be used for accessing shared files
return new SimpleCollection($name);
}
return new FilesHome($principalInfo);
$userFolder = \OC::$server->getUserFolder();
if (!($userFolder instanceof FileInfo)) {
throw new \Exception('Home does not exist');
}
return new FilesHome($principalInfo, $userFolder);
}
function getName() {

Loading…
Cancel
Save