DB_READ -> DB_SLAVE, the former is obsolete
authorAlexandre Emsenhuber <ialex@users.mediawiki.org>
Wed, 18 May 2011 19:29:50 +0000 (19:29 +0000)
committerAlexandre Emsenhuber <ialex@users.mediawiki.org>
Wed, 18 May 2011 19:29:50 +0000 (19:29 +0000)
includes/Block.php
includes/specials/SpecialBlock.php
includes/specials/SpecialProtectedpages.php

index c9404a5..457ae71 100644 (file)
@@ -612,7 +612,7 @@ class Block {
                $autoblock->mHideName = $this->mHideName;
                $autoblock->prevents( 'editownusertalk', $this->prevents( 'editownusertalk' ) );
 
-               $dbr = wfGetDB( DB_READ );
+               $dbr = wfGetDB( DB_SLAVE );
                if ( $this->mTimestamp == $dbr->getInfinity() ) {
                        # Original block was indefinite, start an autoblock now
                        $autoblock->mExpiry = Block::getAutoblockExpiry( wfTimestampNow() );
index 4d32485..bf06f62 100644 (file)
@@ -742,7 +742,7 @@ class SpecialBlock extends SpecialPage {
        public static function parseExpiryInput( $expiry ) {
                static $infinity;
                if( $infinity == null ){
-                       $infinity = wfGetDB( DB_READ )->getInfinity();
+                       $infinity = wfGetDB( DB_SLAVE )->getInfinity();
                }
                if ( $expiry == 'infinite' || $expiry == 'indefinite' ) {
                        $expiry = $infinity;
index a67b7e2..8395964 100644 (file)
@@ -84,7 +84,7 @@ class SpecialProtectedpages extends SpecialPage {
 
                if( is_null( $skin ) ){
                        $skin = $wgUser->getSkin();
-                       $infinity = wfGetDB( DB_READ )->getInfinity();
+                       $infinity = wfGetDB( DB_SLAVE )->getInfinity();
                }
 
                $title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );