tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed DataObject->fieldLabels() to respect flag

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98748 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-02-11 02:18:54 +00:00
parent 5e9b78b798
commit 2fc2d72501
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/model/DataObject.php
View File

@ -3016,9 +3016,6 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
if($ancestorClass == 'ViewableData') break; if($ancestorClass == 'ViewableData') break;
$types = array( $types = array(
'db' => (array) Object::uninherited_static($ancestorClass, 'db'), 'db' => (array) Object::uninherited_static($ancestorClass, 'db'),
'has_one' => (array) Object::uninherited_static($ancestorClass, 'has_one'),
'has_many' => (array) Object::uninherited_static($ancestorClass, 'has_many'),
'many_many' => (array) Object::uninherited_static($ancestorClass, 'many_many')
); );
if($includerelations){ if($includerelations){
$types['has_one'] = (array)singleton($ancestorClass)->uninherited('has_one', true); $types['has_one'] = (array)singleton($ancestorClass)->uninherited('has_one', true);

2
dev/BulkLoader.php
View File

@ -226,7 +226,7 @@ abstract class BulkLoader extends ViewableData {
// get database columns (fieldlabels include fieldname as a key) // get database columns (fieldlabels include fieldname as a key)
// using $$includerelations flag as false, so that it only contain $db fields // using $$includerelations flag as false, so that it only contain $db fields
$spec['fields'] = (array)singleton($this->objectClass)->fieldLabels($includerelations=false); $spec['fields'] = (array)singleton($this->objectClass)->fieldLabels(false);
$has_ones = singleton($this->objectClass)->has_one(); $has_ones = singleton($this->objectClass)->has_one();
$has_manys = singleton($this->objectClass)->has_many(); $has_manys = singleton($this->objectClass)->has_many();