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

Change-Id: Ida4f82b8e17a0f7ba872e46fd8a4c87831e5254f

diff --git a/includes/Block.php b/includes/Block.php
index 03ef906..f3290b6 100644 (file)
--- 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__ );
+               }
        }
 
        /**