From 58c1695c39b14602745c8bea4a9615d24e7a8710 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Fri, 7 Nov 2008 02:57:48 +0000 Subject: [PATCH] MINOR Tidied up ThumbnailStripField->getimages() formatting git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65444 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/ThumbnailStripField.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php index 3bdee102..b823ba29 100755 --- a/code/ThumbnailStripField.php +++ b/code/ThumbnailStripField.php @@ -40,16 +40,15 @@ class ThumbnailStripField extends FormField { */ function getimages() { $result = ''; - $folder = DataObject::get_by_id("Folder", $_GET['folderID']); + $folder = DataObject::get_by_id('Folder', (int) $_GET['folderID']); - if( !$folder ) - return _t('ThumbnailStripField.NOTAFOLDER','This is not a folder'); + if(!$folder) return _t('ThumbnailStripField.NOTAFOLDER', 'This is not a folder'); $folderList = $folder->getDescendantIDList("Folder"); array_unshift($folderList, $folder->ID); - $images = DataObject::get("Image", "ParentID IN (" . implode(', ', $folderList) . ")","Title"); + $images = DataObject::get('Image', 'ParentID IN (' . implode(', ', $folderList) . ')', 'Title'); if($images) { $result .= ''; - }else{ - $result = '

'._t('ThumbnailStripField.NOIMAGESFOUND', 'No images found in').' '. $folder->Title. '

'; + } else { + $result = '

' . _t('ThumbnailStripField.NOIMAGESFOUND', 'No images found in') . ' ' . $folder->Title . '

'; } return $result; - } function getflash() {