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 Making sure that DataObject->has*Field() methods always return an array, in order not to fail any array_key_exists() checks

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64000 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-10-09 14:39:24 +00:00
parent b1b909103e
commit 5f50fee5e9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/model/DataObject.php
View File

@ -2496,7 +2496,7 @@ class DataObject extends ViewableData implements DataObjectInterface {
// Child table
} else {
return $this->customDatabaseFields();
return (array)$this->customDatabaseFields();
}
}
@ -2517,7 +2517,7 @@ class DataObject extends ViewableData implements DataObjectInterface {
}
}
return $def;
return (array)$def;
}
/**
@ -2537,7 +2537,7 @@ class DataObject extends ViewableData implements DataObjectInterface {
$fields = array_merge($fields, (array)$currentObj->customDatabaseFields());
$currentObj = singleton($currentObj->parentClass());
}
return $fields;
return (array)$fields;
}
/**