From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 17 Aug 2005 07:37:47 +0000 (+0000)
Subject: * Fix display of read-only lockfile message
X-Git-Tag: 1.6.0~1924
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=f1f81763176751b1f54f53ee5facce0bd154871f;p=lhc%2Fweb%2Fwiklou.git

* Fix display of read-only lockfile message
Committing live hack.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8b04c37454..1e743dc8e9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -22,6 +22,7 @@ Misc work going on.....
 * (bug 3141) Partial support for Breton language (thanks Fulup).
 * Partial support for Basque language (from wikipedia and meta)
 * (bug 3116) Division by zero on [[Image:Foo.png|123x123px|]]
+* Fix display of read-only lockfile message
 
 
 === Caveats ===
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index a95f5f3d55..383dee5619 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -238,7 +238,7 @@ function wfReadOnly() {
 
 	// Set $wgReadOnly and unset $wgReadOnlyFile, for faster access next time
 	if ( is_file( $wgReadOnlyFile ) ) {
-		$wgReadOnly = true;
+		$wgReadOnly = file_get_contents( $wgReadOnlyFile );
 	} else {
 		$wgReadOnly = false;
 	}