http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88384
Revision: 88384
Author: ialex
Date: 2011-05-18 19:29:50 +0000 (Wed, 18 May 2011)
Log Message:
-----------
DB_READ -> DB_SLAVE, the former is obsolete
Modified Paths:
--------------
trunk/phase3/includes/Block.php
trunk/phase3/includes/specials/SpecialBlock.php
trunk/phase3/includes/specials/SpecialProtectedpages.php
Modified: trunk/phase3/includes/Block.php
===================================================================
--- trunk/phase3/includes/Block.php 2011-05-18 19:26:07 UTC (rev 88383)
+++ trunk/phase3/includes/Block.php 2011-05-18 19:29:50 UTC (rev 88384)
@@ -612,7 +612,7 @@
$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() );
Modified: trunk/phase3/includes/specials/SpecialBlock.php
===================================================================
--- trunk/phase3/includes/specials/SpecialBlock.php 2011-05-18 19:26:07 UTC
(rev 88383)
+++ trunk/phase3/includes/specials/SpecialBlock.php 2011-05-18 19:29:50 UTC
(rev 88384)
@@ -742,7 +742,7 @@
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;
Modified: trunk/phase3/includes/specials/SpecialProtectedpages.php
===================================================================
--- trunk/phase3/includes/specials/SpecialProtectedpages.php 2011-05-18
19:26:07 UTC (rev 88383)
+++ trunk/phase3/includes/specials/SpecialProtectedpages.php 2011-05-18
19:29:50 UTC (rev 88384)
@@ -84,7 +84,7 @@
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 );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs