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

Merge pull request #9321 from nextcloud/bugfix/noid/return_root_folder_when_at_root

Browse source 
Actually return the root folder when traversing up the tree
This commit is contained in:
Morris Jobke 2018-04-27 13:59:29 +02:00 committed by GitHub
commit 7306d30708
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/Files/Node/Node.php
View file

@ -265,7 +265,11 @@ class Node implements \OCP\Files\Node {
* @return Node * @return Node
*/ */
public function getParent() { public function getParent() {
return $this->root->get(dirname($this->path)); $newPath = dirname($this->path);
if ($newPath === '' || $newPath === '.' || $newPath === '/') {
return $this->root;
}
return $this->root->get($newPath);
} }
/** /**