(bug 5559) Improve detection of ImageMagick [patch: Greg Turnquist]

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a212fbc..68a458f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -62,6 +62,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5403) Fix Special:Newpages RSS/Atom feeds
 * Reject malformed addresses in X-Forwarded-For entries
 * (bug 3359) Add hooks on completion of file upload
+* (bug 5559) Improve detection of ImageMagick [patch: Greg Turnquist]
 
 == Compatibility ==
 

diff --git a/config/index.php b/config/index.php
index b203385..8bb6247 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -355,7 +355,7 @@ else
        print "<li>GNU diff3 not found.</li>";
 
 $conf->ImageMagick = false;
-$imcheck = array( "/usr/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" );
+$imcheck = array( "/usr/bin", "/opt/csw/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" );
 foreach( $imcheck as $dir ) {
        $im = "$dir/convert";
        if( file_exists( $im ) ) {