From fcd353ad19ef2aa0af6d9305a1e85ac666f46513 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 9 Jan 2007 06:35:18 +0000 Subject: [PATCH] * Fix regression with default lock file and cache directories; threw visible warning with open_basedir --- HISTORY | 3 +++ includes/DefaultSettings.php | 10 ++++++++-- includes/Setup.php | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index fe57958e53..6e710a09d3 100644 --- a/HISTORY +++ b/HISTORY @@ -461,6 +461,9 @@ setting since version 1.2.0. If you have it on, turn it *off* if you can. * (bug 7948) importDump.php now warn that Recentchanges need to be rebuild. * (bug 7667) allow XHTML namespaces customization * (bug 8531) Correct local name of Lingála (patch by Raymond) +* Fix regression with default lock file and cache directories; threw visible + warning with open_basedir + == 1.8 Compatibility changes == diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 279c5deb93..ea6b8bc80b 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -804,7 +804,12 @@ $wgMaxArticleSize = 2048; # Maximum article size in kilobytes $wgExtraSubtitle = ''; $wgSiteSupportPage = ''; # A page where you users can receive donations -$wgReadOnlyFile = "{$wgUploadDirectory}/lock_yBgMBwiR"; +/*** + * If this lock file exists, the wiki will be forced into read-only mode. + * Its contents will be shown to users as part of the read-only warning + * message. + */ +$wgReadOnlyFile = false; /// defaults to "{$wgUploadDirectory}/lock_yBgMBwiR"; /** * The debug log file should be not be publicly accessible if it is used, as it @@ -1102,8 +1107,9 @@ $wgStyleVersion = '42'; * Must set $wgShowIPinHeader = false */ $wgUseFileCache = false; + /** Directory where the cached page will be saved */ -$wgFileCacheDirectory = "{$wgUploadDirectory}/cache"; +$wgFileCacheDirectory = false; /// defaults to "{$wgUploadDirectory}/cache"; /** * When using the file cache, we can store the cached HTML gzipped to save disk diff --git a/includes/Setup.php b/includes/Setup.php index 8a9436e049..80a5b48abc 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -52,6 +52,9 @@ if( $wgMathPath === false ) $wgMathPath = "{$wgUploadPath}/math"; if( $wgMathDirectory === false ) $wgMathDirectory = "{$wgUploadDirectory}/math"; if( $wgTmpDirectory === false ) $wgTmpDirectory = "{$wgUploadDirectory}/tmp"; +if( $wgReadOnlyFile === false ) $wgReadOnlyFile = "{$wgUploadDirectory}/lock_yBgMBwiR"; +if( $wgFileCacheDirectory === false ) $wgFileCacheDirectory = "{$wgUploadDirectory}/cache"; + require_once( "$IP/includes/AutoLoader.php" ); wfProfileIn( $fname.'-exception' ); -- 2.20.1