From 5c316aa1c008491888427a7fa6c6b975a1ba5bc9 Mon Sep 17 00:00:00 2001 From: Andrew Short Date: Mon, 12 Oct 2009 22:28:30 +0000 Subject: [PATCH] MINOR: Removed unnecessary check in DataObject->hasField() and optimised DataObject->db() call. From: Andrew Short git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88699 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/DataObject.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/model/DataObject.php b/core/model/DataObject.php index c707f6426..e2290f452 100755 --- a/core/model/DataObject.php +++ b/core/model/DataObject.php @@ -2116,8 +2116,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity public function hasField($field) { return ( array_key_exists($field, $this->record) - || $this->hasDatabaseField($field) - || array_key_exists($field, $this->db()) // Needed for composite fields + || $this->db($field) || $this->hasMethod("get{$field}") ); }