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

BUGFIX Added E_USER_ERROR error to ComponentSet::getExtraData() if a NULL component name is passed

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71640 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-02-11 00:18:00 +00:00
parent 1cb6b5c8ee
commit 569447d2ba
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/model/ComponentSet.php
View File

@ -74,12 +74,14 @@ class ComponentSet extends DataObjectSet {
$childField = ($this->childClass == $this->ownerClass) ? 'ChildID' : ($this->childClass . 'ID'); $childField = ($this->childClass == $this->ownerClass) ? 'ChildID' : ($this->childClass . 'ID');
$result = array(); $result = array();
if(!isset($componentName)) {
user_error('ComponentSet::getExtraData() passed a NULL component name', E_USER_ERROR);
}
if(!is_numeric($childID)) { if(!is_numeric($childID)) {
user_error('ComponentSet::getExtraData() passed a non-numeric child ID', E_USER_ERROR); user_error('ComponentSet::getExtraData() passed a non-numeric child ID', E_USER_ERROR);
} }
if(!$componentName) return false;
// @todo Optimize into a single query instead of one per extra field // @todo Optimize into a single query instead of one per extra field
$extraFields = $ownerObj->many_many_extraFields($componentName); $extraFields = $ownerObj->many_many_extraFields($componentName);
if($extraFields) { if($extraFields) {