Skip to content

Actually return the root folder when traversing up the tree #12059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Oct 26, 2018
Merged

Actually return the root folder when traversing up the tree #12059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Actually return the root folder when traversing up the tree 
If you now keep calling $node->getParent() you will at some point get
the RootFolder back. This is a nice termination check and will prevent
endless loops if an exit condition is slightly off.

Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer authored and Mikael Hammarin committed Oct 26, 2018
commit ce7a2117432b139551511fbb07805d3a9ddc2c67
6 changes: 5 additions & 1 deletion lib/private/Files/Node/Node.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,11 @@ public function isCreatable() {
* @return Node
*/
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);
}

/**
Expand Down