From 5f50fee5e94476ea891d0d65abf5890fbdc59d3c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 9 Oct 2008 14:39:24 +0000 Subject: [PATCH] BUGFIX Making sure that DataObject->has*Field() methods always return an array, in order not to fail any array_key_exists() checks git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64000 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/DataObject.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/model/DataObject.php b/core/model/DataObject.php index e3dc65286..3beb95d2f 100644 --- a/core/model/DataObject.php +++ b/core/model/DataObject.php @@ -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; } /**