[BUGFIX] ImageMagick path detection fails on Mac OS X
authorOliver Hader <oliver@typo3.org>
Sun, 31 Jul 2011 21:50:19 +0000 (23:50 +0200)
committerOliver Hader <oliver@typo3.org>
Sun, 31 Jul 2011 21:58:22 +0000 (23:58 +0200)
The ImageMagick path detection fails on Mac OS X. If MacPorts
is used the additional folder /opt/local/bin should be checked.

Change-Id: Ia5fe02c42a61cbc542954b9c297cc78304be3b84
Resolves: #28625
Releases: 4.6, 4.5
Reviewed-on: http://review.typo3.org/3962
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
typo3/sysext/install/mod/class.tx_install.php

index 9c781b1..41e8ba2 100755 (executable)
@@ -1306,7 +1306,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                $paths = array_merge($paths, explode(';', $_SERVER['PATH']));
                        }
                } else {
-                       $paths=array($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path_lzw'], $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path'], '/usr/local/bin/','/usr/bin/','/usr/X11R6/bin/');
+                       $paths=array($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path_lzw'], $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path'], '/usr/local/bin/','/usr/bin/','/usr/X11R6/bin/', '/opt/local/bin/');
                        $paths = array_merge($paths, explode(':', $_SERVER['PATH']));
                }
                $paths = array_unique($paths);