Skip to content

Commit

Permalink
fix parentconfiguration
Browse files Browse the repository at this point in the history
  • Loading branch information
TonisOrmisson committed Jan 2, 2018
1 parent a151820 commit 93b7124
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions application/models/TemplateConfiguration.php
Expand Up @@ -999,10 +999,7 @@ public function __get($name)
$sAttribute = parent::__get($name);
if ($sAttribute === 'inherit') {
// NOTE: this is object recursive (if parent configuration field is set to inherit, then it will lead to this method again.)
$sAttribute = null;
if(property_exists($this->getParentConfiguration(), $name)){
$sAttribute = $this->getParentConfiguration()->$name;
}
$sAttribute = $this->getParentConfiguration()->$name;
}
} else {
$sAttribute = parent::__get($name);
Expand Down

0 comments on commit 93b7124

Please sign in to comment.