r25599 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r25598‎ | r25599 | r25600 >
Date:20:08, 6 September 2007
Author:robchurch
Status:old
Tags:
Comment:
(bug 3846) Suppress warnings from, e.g. open_basedir when scanning for ImageMagick, diff3 et al. during installation [patch by Jan Reininghaus]
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/config/index.php (modified) (history)

Diff [purge]

Index: trunk/phase3/config/index.php
@@ -514,7 +514,7 @@
515515 $imcheck = array( "/usr/bin", "/opt/csw/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" );
516516 foreach( $imcheck as $dir ) {
517517 $im = "$dir/convert";
518 - if( file_exists( $im ) ) {
 518+ if( @file_exists( $im ) ) {
519519 print "<li>Found ImageMagick: <tt>$im</tt>; image thumbnailing will be enabled if you enable uploads.</li>\n";
520520 $conf->ImageMagick = $im;
521521 break;
@@ -1790,7 +1790,7 @@
17911791
17921792 foreach ($names as $name) {
17931793 $command = "$loc".DIRECTORY_SEPARATOR."$name";
1794 - if (file_exists($command)) {
 1794+ if (@file_exists($command)) {
17951795 if (!$versioninfo)
17961796 return $command;
17971797
Index: trunk/phase3/RELEASE-NOTES
@@ -23,13 +23,15 @@
2424 === New features in 1.12 ===
2525
2626 === Bug fixes in 1.12 ===
27 -* Subpages are now indexed for searching properly when using Postgres
2827
 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+
2932 === API changes in 1.12 ===
3033
3134 Full API documentation is available at http://www.mediawiki.org/wiki/API
3235
33 -
3436 === Languages updated in 1.12 ===
3537
3638 == Compatibility ==

Follow-up revisions

RevisionCommit summaryAuthorDate
r25607Merged revisions 25530-25606 via svnmerge from...david06:11, 7 September 2007

Status & tagging log