From 2d6b8a50b1a56561f2e1ef395a4787e5d8dd3480 Mon Sep 17 00:00:00 2001 From: Silbinary Wolf Date: Sat, 5 Dec 2015 18:53:29 +1100 Subject: [PATCH] Fixed bug where inheriting an abstract class broke scaffoldFormFields / fieldLabels(true) --- model/DataObject.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/model/DataObject.php b/model/DataObject.php index 96877b6bc..ed5a963b4 100644 --- a/model/DataObject.php +++ b/model/DataObject.php @@ -3628,10 +3628,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity 'db' => (array)Config::inst()->get($ancestorClass, 'db', Config::UNINHERITED) ); if($includerelations){ - $types['has_one'] = (array)singleton($ancestorClass)->uninherited('has_one', true); - $types['has_many'] = (array)singleton($ancestorClass)->uninherited('has_many', true); - $types['many_many'] = (array)singleton($ancestorClass)->uninherited('many_many', true); - $types['belongs_many_many'] = (array)singleton($ancestorClass)->uninherited('belongs_many_many', true); + $types['has_one'] = (array)Config::inst()->get($ancestorClass, 'has_one', Config::UNINHERITED); + $types['has_many'] = (array)Config::inst()->get($ancestorClass, 'has_many', Config::UNINHERITED); + $types['many_many'] = (array)Config::inst()->get($ancestorClass, 'many_many', Config::UNINHERITED); + $types['belongs_many_many'] = (array)Config::inst()->get($ancestorClass, 'belongs_many_many', Config::UNINHERITED); } foreach($types as $type => $attrs) { foreach($attrs as $name => $spec) {