From 8feda3a26fa71128e7f2cfcdbd5fe7858f696b6e Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 17 Jan 2013 14:25:55 -0800 Subject: [PATCH] Made Block::purgeExpired() check for read-only mode. Change-Id: Ida4f82b8e17a0f7ba872e46fd8a4c87831e5254f --- includes/Block.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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__ ); + } } /** -- 2.20.1