tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5215 from tractorcow/pulls/3.2/fix-folder-relativepath

Browse Source 
BUG Fix File::getRelativePath() failing if parent folder is renamed
This commit is contained in:
Daniel Hensby 2016-03-21 09:09:12 +00:00
commit d2fa01fb17
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
filesystem/File.php
View File

@ -743,7 +743,9 @@ class File extends DataObject {
if($this->ParentID) {
// Don't use the cache, the parent has just been changed
$p = DataObject::get_by_id('Folder', $this->ParentID, false);
if($p && $p->exists()) return $p->getRelativePath() . $this->getField("Name");
if($p && $p->isInDB()) {
return $p->getRelativePath() . $this->getField("Name");
}
else return ASSETS_DIR . "/" . $this->getField("Name");
} else if($this->getField("Name")) {
return ASSETS_DIR . "/" . $this->getField("Name");