From 41f8d01ccac9135bdaa59c6807a874992a274fbb Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Thu, 13 Apr 2006 18:40:36 +0000
Subject: [PATCH] (bug 5559) Improve detection of ImageMagick [patch: Greg
 Turnquist]

---
 RELEASE-NOTES    | 1 +
 config/index.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a212fbc0ed..68a458ffc2 100644
--- 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 b203385f70..8bb6247099 100644
--- 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 ) ) {
-- 
2.20.1