From 02332da7fb20026baac7f54dc12db8f08cc0c188 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 15 Jun 2012 13:33:34 +0200 Subject: [PATCH] MINOR GridField compat with ViewableData records (fixes #7479) Only use relField() when it exists (usually on DataObject), otherwise fall back to method or value returns (same as original GridFieldDataColumns behaviour). --- forms/gridfield/GridField.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/forms/gridfield/GridField.php b/forms/gridfield/GridField.php index ae4486dae..7ea9ce4c8 100755 --- a/forms/gridfield/GridField.php +++ b/forms/gridfield/GridField.php @@ -438,7 +438,13 @@ class GridField extends FormField { } // Default implementation - return $record->relField($fieldName); + if($record->hasMethod('relField')) { + return $record->relField($fieldName); + } elseif($record->hasMethod($fieldName)) { + return $record->$fieldName(); + } else { + return $record->$fieldName; + } } /**