From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 17 Jan 2013 22:25:55 +0000 (-0800)
Subject: Made Block::purgeExpired() check for read-only mode.
X-Git-Tag: 1.31.0-rc.0~21010
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=8feda3a26fa71128e7f2cfcdbd5fe7858f696b6e;p=lhc%2Fweb%2Fwiklou.git

Made Block::purgeExpired() check for read-only mode.

Change-Id: Ida4f82b8e17a0f7ba872e46fd8a4c87831e5254f
---

diff --git a/includes/Block.php b/includes/Block.php
index 03ef906cb9..f3290b6160 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -997,9 +997,11 @@ class Block {
 	 * Purge expired blocks from the ipblocks table
 	 */
 	public static function purgeExpired() {
-		$dbw = wfGetDB( DB_MASTER );
-		$dbw->delete( 'ipblocks',
-			array( 'ipb_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ), __METHOD__ );
+		if ( !wfReadOnly() ) {
+			$dbw = wfGetDB( DB_MASTER );
+			$dbw->delete( 'ipblocks',
+				array( 'ipb_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ), __METHOD__ );
+		}
 	}
 
 	/**