wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9583 from nextcloud/files-home-userfolder

Browse source 
use getUserFolder instead of getFileInfo when constructing FilesHome
This commit is contained in:
Morris Jobke 2018-05-29 16:50:01 +02:00 committed by GitHub
commit 7f301be188
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/dav/lib/Files/FilesHome.php
View file

@ -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() {

7
apps/dav/lib/Files/RootCollection.php
View file

@ -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() {