dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80f4f24
)
MTT r63686: Handle realpath errors in SQLite installer
author
Max Semenik
<maxsem@users.mediawiki.org>
Sat, 13 Mar 2010 16:47:32 +0000
(16:47 +0000)
committer
Max Semenik
<maxsem@users.mediawiki.org>
Sat, 13 Mar 2010 16:47:32 +0000
(16:47 +0000)
config/Installer.php
patch
|
blob
|
history
diff --git
a/config/Installer.php
b/config/Installer.php
index
a54fc97
..
c4e2a4c
100644
(file)
--- a/
config/Installer.php
+++ b/
config/Installer.php
@@
-1776,7
+1776,11
@@
function writeLocalSettings( $conf ) {
$convert = ($conf->ImageMagick ? $conf->ImageMagick : "/usr/bin/convert" );
$rights = ($conf->RightsUrl) ? "" : "# ";
$hashedUploads = $conf->safeMode ? '' : '# ';
- $sqliteDataDir = escapePhpString( realpath($conf->SQLiteDataDir) );
+ $dir = realpath( $conf->SQLiteDataDir );
+ if ( !$dir ) {
+ $dir = $conf->SQLiteDataDir; // dumb realpath sometimes fails
+ }
+ $sqliteDataDir = escapePhpString( $dir );
if ( $conf->ShellLocale ) {
$locale = '';