From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 18 May 2011 19:29:50 +0000 (+0000)
Subject: DB_READ -> DB_SLAVE, the former is obsolete
X-Git-Tag: 1.31.0-rc.0~30090
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=9536c97c0006f60dafc5652b80c9b3442771db28;p=lhc%2Fweb%2Fwiklou.git

DB_READ -> DB_SLAVE, the former is obsolete
---

diff --git a/includes/Block.php b/includes/Block.php
index c9404a5c03..457ae714e1 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -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() );
diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
index 4d324856cd..bf06f62adb 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -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;
diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php
index a67b7e2716..83959648f8 100644
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -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 );