tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 13:19:11 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Fixed non-object errors in VirtualPage? if source not found (from r81983)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89710 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-10-21 02:19:40 +00:00
parent b117becef5
commit 0b7d187817
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/model/VirtualPage.php
View File

@ -115,13 +115,16 @@ class VirtualPage extends Page {
&& $this instanceof VirtualPage
) {
$source = DataObject::get_one("SiteTree",sprintf('"SiteTree"."ID" = %d', $this->CopyContentFromID));
$this->copyFrom($source);
$this->URLSegment = $source->URLSegment . '-' . $this->ID;
if($source) {
$this->copyFrom($source);
$this->URLSegment = $source->URLSegment . '-' . $this->ID;
}
}
}
parent::onBeforeWrite();
}
/**
* Ensure we have an up-to-date version of everything.
*/