From b810ee70253600505761e8d4d3370a504c4568e9 Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Thu, 12 Mar 2009 12:10:47 +0000
Subject: [PATCH] Merged V3.1 to HEAD    13323: *RECORD-ONLY* Enterprise
 branding (ETHREEOH-1352 - Community logo in Enterprise version) - DO NOT
 MERGE    13325: ETHREEOH-102/ETHREEOH-981 - Thumbnail service doesn't support
 animated GIFs and no placeholder returned    13329: ETHREEOH-1417 - Clicking
 "Create Link" button in Site Links dashlet opens user's dashboard in IE7   
 13340: Fix for TinyMCE image-library button image not appearing in all
 browsers    13379: Wiki dashlet - added link to configured wiki page

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13597 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../magick/ImageMagickContentTransformer.java        |  2 +-
 .../repo/thumbnail/ThumbnailServiceImpl.java         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformer.java b/source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformer.java
index 7fb4836ed5..8f815a9af4 100644
--- a/source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformer.java
+++ b/source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformer.java
@@ -166,7 +166,7 @@ public class ImageMagickContentTransformer extends AbstractImageMagickContentTra
             }
             properties.put(KEY_OPTIONS, commandOptions);
         }
-        properties.put(VAR_SOURCE, sourceFile.getAbsolutePath());
+        properties.put(VAR_SOURCE, sourceFile.getAbsolutePath() + "[0]");
         properties.put(VAR_TARGET, targetFile.getAbsolutePath());
         
         // execute the statement
diff --git a/source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java b/source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java
index 725dd9ae32..8e90806702 100644
--- a/source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java
+++ b/source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java
@@ -156,10 +156,10 @@ public class ThumbnailServiceImpl implements ThumbnailService
         {
             if (logger.isDebugEnabled() == true)
             {
-                logger.debug("Creating thumbnail: There is already a thumbnail with the name '" + thumbnail + "' (node=" + node.toString() + "; contentProperty=" + contentProperty.toString() + "; mimetype=" + mimetype);
+                logger.debug("Creating thumbnail: There is already a thumbnail with the name '" + thumbnailName + "' (node=" + node.toString() + "; contentProperty=" + contentProperty.toString() + "; mimetype=" + mimetype);
             }
             
-            // We can't continue because there is already an thumnail with the given name for that content property
+            // We can't continue because there is already an thumbnail with the given name for that content property
             throw new ThumbnailException(ERR_DUPLICATE_NAME);
         }
         
@@ -233,7 +233,7 @@ public class ThumbnailServiceImpl implements ThumbnailService
         }
         else
         {
-            // Do the thumnail transformation
+            // Do the thumbnail transformation
             this.contentService.transform(reader, writer, transformationOptions);
         }
         
@@ -309,7 +309,7 @@ public class ThumbnailServiceImpl implements ThumbnailService
             }
             else
             {
-                // Do the thumnail transformation
+                // Do the thumbnail transformation
                 this.contentService.transform(reader, writer, transformationOptions);
             }
         }
@@ -344,7 +344,7 @@ public class ThumbnailServiceImpl implements ThumbnailService
         // Check that the node has the thumbnailed aspect applied
         if (nodeService.hasAspect(node, ContentModel.ASPECT_THUMBNAILED) == true)
         {
-            // Get all the thumnails that match the thumbnail name
+            // Get all the thumbnails that match the thumbnail name
             List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(node, ContentModel.ASSOC_THUMBNAILS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, thumbnailName));
             for (ChildAssociationRef assoc : assocs)
             {
@@ -384,7 +384,7 @@ public class ThumbnailServiceImpl implements ThumbnailService
         // Check that the node has the thumbnailed aspect applied
         if (nodeService.hasAspect(node, ContentModel.ASPECT_THUMBNAILED) == true)
         {
-            // Get all the thumnails that match the thumbnail name
+            // Get all the thumbnails that match the thumbnail name
             List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(node, ContentModel.ASSOC_THUMBNAILS, RegexQNamePattern.MATCH_ALL);
             for (ChildAssociationRef assoc : assocs)
             {