private $mMainModule;
/** @var string */
private $mModuleName, $mModulePrefix;
- private $mSlaveDB = null;
+ private $mReplicaDB = null;
private $mParamCache = [];
/** @var array|null|bool */
private $mModuleSource = false;
* @return IDatabase
*/
protected function getDB() {
- if ( !isset( $this->mSlaveDB ) ) {
- $this->mSlaveDB = wfGetDB( DB_REPLICA, 'api' );
+ if ( !isset( $this->mReplicaDB ) ) {
+ $this->mReplicaDB = wfGetDB( DB_REPLICA, 'api' );
}
- return $this->mSlaveDB;
+ return $this->mReplicaDB;
}
/**
/**
* Get blocking information
- * @param bool $bFromSlave Whether to check the replica DB first.
+ * @param bool $bFromReplica Whether to check the replica DB first.
* To improve performance, non-critical checks are done against replica DBs.
* Check when actually saving should be done against master.
*/
- private function getBlockedStatus( $bFromSlave = true ) {
+ private function getBlockedStatus( $bFromReplica = true ) {
global $wgProxyWhitelist, $wgUser, $wgApplyIpBlocksToXff, $wgSoftBlockRanges;
if ( -1 != $this->mBlockedby ) {
}
// User/IP blocking
- $block = Block::newFromTarget( $this, $ip, !$bFromSlave );
+ $block = Block::newFromTarget( $this, $ip, !$bFromReplica );
// Cookie blocking
if ( !$block instanceof Block ) {
$xff = $this->getRequest()->getHeader( 'X-Forwarded-For' );
$xff = array_map( 'trim', explode( ',', $xff ) );
$xff = array_diff( $xff, [ $ip ] );
- $xffblocks = Block::getBlocksForIPList( $xff, $this->isAnon(), !$bFromSlave );
+ $xffblocks = Block::getBlocksForIPList( $xff, $this->isAnon(), !$bFromReplica );
$block = Block::chooseBlock( $xffblocks, $xff );
if ( $block instanceof Block ) {
# Mangle the reason to alert the user that the block
/**
* Check if user is blocked
*
- * @param bool $bFromSlave Whether to check the replica DB instead of
+ * @param bool $bFromReplica Whether to check the replica DB instead of
* the master. Hacked from false due to horrible probs on site.
* @return bool True if blocked, false otherwise
*/
- public function isBlocked( $bFromSlave = true ) {
- return $this->getBlock( $bFromSlave ) instanceof Block && $this->getBlock()->prevents( 'edit' );
+ public function isBlocked( $bFromReplica = true ) {
+ return $this->getBlock( $bFromReplica ) instanceof Block && $this->getBlock()->prevents( 'edit' );
}
/**
* Get the block affecting the user, or null if the user is not blocked
*
- * @param bool $bFromSlave Whether to check the replica DB instead of the master
+ * @param bool $bFromReplica Whether to check the replica DB instead of the master
* @return Block|null
*/
- public function getBlock( $bFromSlave = true ) {
- $this->getBlockedStatus( $bFromSlave );
+ public function getBlock( $bFromReplica = true ) {
+ $this->getBlockedStatus( $bFromReplica );
return $this->mBlock instanceof Block ? $this->mBlock : null;
}
* Check if user is blocked from editing a particular article
*
* @param Title $title Title to check
- * @param bool $fromSlave Whether to check the replica DB instead of the master
+ * @param bool $fromReplica Whether to check the replica DB instead of the master
* @return bool
*/
- public function isBlockedFrom( $title, $fromSlave = false ) {
+ public function isBlockedFrom( $title, $fromReplica = false ) {
$blocked = $this->isHidden();
if ( !$blocked ) {
- $block = $this->getBlock( $fromSlave );
+ $block = $this->getBlock( $fromReplica );
if ( $block ) {
$blocked = $block->preventsEdit( $title );
}
'load' => 0,
'flags' => DBO_TRX // REPEATABLE-READ for consistency
],
- [ // emulated slave
+ [ // emulated replica
'host' => $wgDBserver,
'dbname' => $wgDBname,
'user' => $wgDBuser,
'cluster master set' );
$dbr = $lb->getConnection( DB_REPLICA );
- $this->assertTrue( $dbr->getLBInfo( 'replica' ), 'slave shows as slave' );
+ $this->assertTrue( $dbr->getLBInfo( 'replica' ), 'replica shows as replica' );
$this->assertEquals(
( $wgDBserver != '' ) ? $wgDBserver : 'localhost',
$dbr->getLBInfo( 'clusterMasterHost' ),
$this->assertTrue( $dbw->getLBInfo( 'master' ), 'master shows as master' );
$dbr = $factory->getMainLB()->getConnection( DB_REPLICA );
- $this->assertTrue( $dbr->getLBInfo( 'replica' ), 'slave shows as slave' );
+ $this->assertTrue( $dbr->getLBInfo( 'replica' ), 'replica shows as replica' );
// Destructor should trigger without round stage errors
unset( $factory );