(bug 3846) Suppress warnings from, e.g. open_basedir when scanning for ImageMagick...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ee9b0cf..cb4f712 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -23,13 +23,15 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 === New features in 1.12 ===
 
 === Bug fixes in 1.12 ===
-* Subpages are now indexed for searching properly when using Postgres
+
+* Subpages are now indexed for searching properly when using PostgreSQL
+* (bug 3846) Suppress warnings from, e.g. open_basedir when scanning for
+  ImageMagick, diff3 et al. during installation [patch by Jan Reininghaus]
 
 === API changes in 1.12 ===
 
 Full API documentation is available at http://www.mediawiki.org/wiki/API
 
-
 === Languages updated in 1.12 ===
 
 == Compatibility ==

diff --git a/config/index.php b/config/index.php
index 274a153..b59b59d 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -514,7 +514,7 @@ $conf->ImageMagick = false;
 $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 ) ) {
+       if( @file_exists( $im ) ) {
                print "<li>Found ImageMagick: <tt>$im</tt>; image thumbnailing will be enabled if you enable uploads.</li>\n";
                $conf->ImageMagick = $im;
                break;
@@ -1790,7 +1790,7 @@ function locate_executable($loc, $names, $versioninfo = false) {
 
        foreach ($names as $name) {
                $command = "$loc".DIRECTORY_SEPARATOR."$name";
-               if (file_exists($command)) {
+               if (@file_exists($command)) {
                        if (!$versioninfo)
                                return $command;