From 13bf61d402e4d9ea6d1a3106ff68a8fe0f437a2e Mon Sep 17 00:00:00 2001 From: jakr Date: Sun, 29 Jul 2012 21:40:14 +0200 Subject: [PATCH] Reformatted GridFieldDataColumns->castValue and added missing assignment. --- forms/gridfield/GridFieldDataColumns.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/forms/gridfield/GridFieldDataColumns.php b/forms/gridfield/GridFieldDataColumns.php index 34f993147..d47d22b89 100644 --- a/forms/gridfield/GridFieldDataColumns.php +++ b/forms/gridfield/GridFieldDataColumns.php @@ -212,16 +212,17 @@ class GridFieldDataColumns implements GridField_ColumnProvider { // If a fieldCasting is specified, we assume the result is safe if(array_key_exists($fieldName, $this->fieldCasting)) { $value = $gridField->getCastedValue($value, $this->fieldCasting[$fieldName]); - } - // If the value is an object, we do one of two things - else if(is_object($value)) { - // If it has a "Nice" method, call that & make sure the result is safe - if (method_exists($value, 'Nice')) Convert::raw2xml($value->Nice()); - // Otherwise call forTemplate - the result of this should already be safe - else $value = $value->forTemplate(); - } - // Otherwise, just treat as a text string & make sure the result is safe - else { + } else if(is_object($value)) { + // If the value is an object, we do one of two things + if (method_exists($value, 'Nice')) { + // If it has a "Nice" method, call that & make sure the result is safe + $value = Convert::raw2xml($value->Nice()); + } else { + // Otherwise call forTemplate - the result of this should already be safe + $value = $value->forTemplate(); + } + } else { + // Otherwise, just treat as a text string & make sure the result is safe $value = Convert::raw2xml($value); }