From dd92e9b243b154b8f3da446966f6e2290505e938 Mon Sep 17 00:00:00 2001 From: devjin Date: Wed, 24 Oct 2012 02:25:08 +0000 Subject: [PATCH] issue 2369 revert r11850. git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11851 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/layout/layout.model.php | 53 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index 6697cd7ed..5c1a3e295 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -53,36 +53,33 @@ $layoutList = $this->getLayoutInstanceList($siteSrl, $layoutType); $thumbs = array(); - - if($layoutType != 'M') - { - foreach($layoutList as $key => $val) - { - if($thumbs[$val->layouts]) - { - $val->thumbnail = $thumbs[$val->layouts]; - continue; - } - $token = explode('|@|', $val->layout); - if(count($token) == 2) - { - $thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png' , $token[0], $token[1]); - } - else - { - $thumbnailPath = sprintf('./layouts/%s/thumbnail.png' , $val->layout); - } - if(is_readable($thumbnailPath)) - { - $val->thumbnail = $thumbnailPath; - } - else - { - $val->thumbnail = sprintf('./modules/layout/tpl/images/noThumbnail.jpg'); - } - $thumbs[$val->layout] = $val->thumbnail; + foreach($layoutList as $key => $val) + { + if($thumbs[$val->layouts]) + { + $val->thumbnail = $thumbs[$val->layouts]; + continue; } + + $token = explode('|@|', $val->layout); + if(count($token) == 2) + { + $thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png' , $token[0], $token[1]); + } + else + { + $thumbnailPath = sprintf('./layouts/%s/thumbnail.png' , $val->layout); + } + if(is_readable($thumbnailPath)) + { + $val->thumbnail = $thumbnailPath; + } + else + { + $val->thumbnail = sprintf('./modules/layout/tpl/images/noThumbnail.jpg'); + } + $thumbs[$val->layout] = $val->thumbnail; } $this->add('layout_list', $layoutList); }