From 0e727e458de78f1886ba6ea6a2b00a078a5834e9 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Fri, 7 Nov 2008 03:05:43 +0000 Subject: [PATCH] MINOR Tidied up ThumbnailStripField->getimages() formatting git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65446 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/ThumbnailStripField.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php index 3984398b..deefd09b 100755 --- a/code/ThumbnailStripField.php +++ b/code/ThumbnailStripField.php @@ -41,10 +41,10 @@ class ThumbnailStripField extends FormField { function getimages() { $result = ''; $folder = DataObject::get_by_id('Folder', (int) $_GET['folderID']); - + 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');