Follow-up to bug #10025: Searching for ImageMagick in basic configuration does not...
authorOliver Hader <oliver.hader@typo3.org>
Sun, 5 Apr 2009 18:03:39 +0000 (18:03 +0000)
committerOliver Hader <oliver.hader@typo3.org>
Sun, 5 Apr 2009 18:03:39 +0000 (18:03 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5288 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_div.php

index c7f6682..e5d4478 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-05  Oliver Hader  <oliver@typo3.org>
+
+       * Follow-up to bug #10025: Searching for ImageMagick in basic configuration does not work
+
 2009-04-05  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up to issue #10834: htmlArea RTE: IE8 now uses standard name for DOM class attribute
index 66b9e7c..e0c4054 100644 (file)
@@ -5381,10 +5381,10 @@ final class t3lib_div {
                }
 
                        // strip profile information for thumbnails and reduce their size
-               if ($command != 'identify' && $gfxConf['im_useStripProfileByDefault'] && $gfxConf['im_stripProfileCommand'] != '') {
+               if ($parameters && $command != 'identify' && $gfxConf['im_useStripProfileByDefault'] && $gfxConf['im_stripProfileCommand'] != '') {
                        if (strpos($parameters, $gfxConf['im_stripProfileCommand']) === false) {
                                        // Determine whether the strip profile action has be disabled by TypoScript:
-                               if ($parameters !== '' && $parameters !== '-version' && strpos($parameters, '###SkipStripProfile###') === false) {
+                               if ($parameters !== '-version' && strpos($parameters, '###SkipStripProfile###') === false) {
                                        $parameters = $gfxConf['im_stripProfileCommand'] . ' ' . $parameters;
                                } else {
                                        $parameters = str_replace('###SkipStripProfile###', '', $parameters);