Browse files

MINOR: Modify VirtualPage to work with lazy loading.

  • Loading branch information...
1 parent 98a0331 commit db3332e629676b0328446c96a11f6190b6da536b @robert-h-curry robert-h-curry committed Apr 20, 2012
Showing with 4 additions and 3 deletions.
  1. +4 −3 code/model/VirtualPage.php
View
7 code/model/VirtualPage.php
@@ -69,11 +69,12 @@ function getVirtualFields() {
* @return SiteTree Returns the linked page, or failing that, a new object.
*/
function CopyContentFrom() {
- if(empty($this->record['CopyContentFromID'])) return new SiteTree();
+ $copyContentFromID = $this->CopyContentFromID;
+ if(!$copyContentFromID) return new SiteTree();
if(!isset($this->components['CopyContentFrom'])) {
$this->components['CopyContentFrom'] = DataObject::get_by_id("SiteTree",
- $this->record['CopyContentFromID']);
+ $copyContentFromID);
// Don't let VirtualPages point to other VirtualPages
if($this->components['CopyContentFrom'] instanceof VirtualPage) {
@@ -89,7 +90,7 @@ function CopyContentFrom() {
return $this->components['CopyContentFrom'] ? $this->components['CopyContentFrom'] : new SiteTree();
}
function setCopyContentFromID($val) {
- if(DataObject::get_by_id('SiteTree', $val) instanceof VirtualPage) $val = 0;
+ if($val && DataObject::get_by_id('SiteTree', $val) instanceof VirtualPage) $val = 0;
return $this->setField("CopyContentFromID", $val);
}

0 comments on commit db3332e

Please sign in to comment.