Skip to content
Permalink
Browse files

BUG Fixing model not being set before populateDefaults()

In cases where a getter on a DataObject calls getComponent() or
other relational getter, $this->model won't have been set at
this point, and a fatal error is triggered.

This fixes it so $this->model is set *before* populateDefaults()
in DataObject::__construct() and the getters can operate normally.
  • Loading branch information...
halkyon committed Oct 11, 2012
1 parent 6de479c commit bc345803d558328c13be6b027ab2c6ffc31d7b0a
Showing with 5 additions and 4 deletions.
  1. +5 −4 model/DataObject.php
@@ -312,7 +312,6 @@ private static function cache_composite_fields($class) {
* Singletons don't have their defaults set.
*/
public function __construct($record = null, $isSingleton = false, $model = null) {
parent::__construct();
// Set the fields data.
@@ -366,15 +365,17 @@ public function __construct($record = null, $isSingleton = false, $model = null)
HTTP::register_modification_date($record['LastEdited']);
}
// this must be called before populateDefaults(), as field getters on a DataObject
// may call getComponent() and others, which rely on $this->model being set.
$this->model = $model ? $model : DataModel::inst();
// Must be called after parent constructor
if(!$isSingleton && (!isset($this->record['ID']) || !$this->record['ID'])) {
$this->populateDefaults();
}
// prevent populateDefaults() and setField() from marking overwritten defaults as changed
$this->changed = array();
$this->model = $model ? $model : DataModel::inst();
}
/**
@@ -1303,7 +1304,7 @@ public function getComponent($componentName) {
if($joinID) {
$component = $this->model->$class->byID($joinID);
}
if(!isset($component) || !$component) {
$component = $this->model->$class->newObject();
}

0 comments on commit bc34580

Please sign in to comment.
You can’t perform that action at this time.