Index: trunk/phase3/config/index.php |
— | — | @@ -514,7 +514,7 @@ |
515 | 515 | $imcheck = array( "/usr/bin", "/opt/csw/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" ); |
516 | 516 | foreach( $imcheck as $dir ) { |
517 | 517 | $im = "$dir/convert"; |
518 | | - if( file_exists( $im ) ) { |
| 518 | + if( @file_exists( $im ) ) { |
519 | 519 | print "<li>Found ImageMagick: <tt>$im</tt>; image thumbnailing will be enabled if you enable uploads.</li>\n"; |
520 | 520 | $conf->ImageMagick = $im; |
521 | 521 | break; |
— | — | @@ -1790,7 +1790,7 @@ |
1791 | 1791 | |
1792 | 1792 | foreach ($names as $name) { |
1793 | 1793 | $command = "$loc".DIRECTORY_SEPARATOR."$name"; |
1794 | | - if (file_exists($command)) { |
| 1794 | + if (@file_exists($command)) { |
1795 | 1795 | if (!$versioninfo) |
1796 | 1796 | return $command; |
1797 | 1797 | |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -23,13 +23,15 @@ |
24 | 24 | === New features in 1.12 === |
25 | 25 | |
26 | 26 | === Bug fixes in 1.12 === |
27 | | -* Subpages are now indexed for searching properly when using Postgres |
28 | 27 | |
| 28 | +* Subpages are now indexed for searching properly when using PostgreSQL |
| 29 | +* (bug 3846) Suppress warnings from, e.g. open_basedir when scanning for |
| 30 | + ImageMagick, diff3 et al. during installation [patch by Jan Reininghaus] |
| 31 | + |
29 | 32 | === API changes in 1.12 === |
30 | 33 | |
31 | 34 | Full API documentation is available at http://www.mediawiki.org/wiki/API |
32 | 35 | |
33 | | - |
34 | 36 | === Languages updated in 1.12 === |
35 | 37 | |
36 | 38 | == Compatibility == |