r63686 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r63685‎ | r63686 | r63687 >
Date:16:42, 13 March 2010
Author:maxsem
Status:ok
Tags:
Comment:
Handle realpath errors in SQLite installer
Modified paths:
  • /branches/REL1_16/phase3/config/Installer.php (modified) (history)

Diff [purge]

Index: branches/REL1_16/phase3/config/Installer.php
@@ -1776,7 +1776,11 @@
17771777 $convert = ($conf->ImageMagick ? $conf->ImageMagick : "/usr/bin/convert" );
17781778 $rights = ($conf->RightsUrl) ? "" : "# ";
17791779 $hashedUploads = $conf->safeMode ? '' : '# ';
1780 - $sqliteDataDir = escapePhpString( realpath($conf->SQLiteDataDir) );
 1780+ $dir = realpath( $conf->SQLiteDataDir );
 1781+ if ( !$dir ) {
 1782+ $dir = $conf->SQLiteDataDir; // dumb realpath sometimes fails
 1783+ }
 1784+ $sqliteDataDir = escapePhpString( $dir );
17811785
17821786 if ( $conf->ShellLocale ) {
17831787 $locale = '';

Follow-up revisions

RevisionCommit summaryAuthorDate
r63688MTT r63686: Handle realpath errors in SQLite installermaxsem16:47, 13 March 2010

Status & tagging log