[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove temporary hole in abstractions
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365419 )
Change subject: Remove temporary hole in abstractions
..
Remove temporary hole in abstractions
Was introduced temprarily to facilitate event logging, now the only caller is
gone.
Bug: T166247
Change-Id: I0f9cdccc6b3a566d9f7ebf02515f724348205071
---
M includes/user/User.php
1 file changed, 0 insertions(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Kaldari: Looks good to me, approved
diff --git a/includes/user/User.php b/includes/user/User.php
index a1119fa..7bf6be5 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -305,12 +305,6 @@
/** @var integer User::READ_* constant bitfield used to load data */
protected $queryFlagsUsed = self::READ_NORMAL;
- /** @var string Indicates type of block (used for eventlogging)
-* Permitted values: 'cookie-block', 'proxy-block', 'openproxy-block',
'xff-block',
-* 'config-block'
-*/
- public $blockTrigger = false;
-
public static $idCacheByName = [];
/**
@@ -1676,7 +1670,6 @@
'address' => $ip,
'systemBlock' => 'proxy',
] );
- $this->blockTrigger = 'proxy-block';
} elseif ( $this->isAnon() && $this->isDnsBlacklisted(
$ip ) ) {
$block = new Block( [
'byText' => wfMessage( 'sorbs'
)->text(),
@@ -1684,7 +1677,6 @@
'address' => $ip,
'systemBlock' => 'dnsbl',
] );
- $this->blockTrigger = 'openproxy-block';
}
}
@@ -1703,7 +1695,6 @@
# Mangle the reason to alert the user that the
block
# originated from matching the X-Forwarded-For
header.
$block->mReason = wfMessage( 'xffblockreason',
$block->mReason )->text();
- $this->blockTrigger = 'xff-block';
}
}
@@ -1719,7 +1710,6 @@
'anonOnly' => true,
'systemBlock' => 'wgSoftBlockRanges',
] );
- $this->blockTrigger = 'config-block';
}
if ( $block instanceof Block ) {
@@ -1733,7 +1723,6 @@
$this->mBlockedby = '';
$this->mHideName = 0;
$this->mAllowUsertalk = false;
- $this->blockTrigger = false;
}
// Avoid PHP 7.1 warning of passing $this by reference
@@ -1766,7 +1755,6 @@
$useBlockCookie = ( $config->get(
'CookieSetOnAutoblock' ) === true );
if ( $blockIsValid && $useBlockCookie ) {
// Use the block.
- $this->blockTrigger = 'cookie-block';
return $tmpBlock;
} else {
// If the block is not valid, remove
the cookie.
--
To view, visit https://gerrit.wikimedia.org/r/365419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f9cdccc6b3a566d9f7ebf02515f724348205071
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove temporary hole in abstractions
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/365419 )
Change subject: Remove temporary hole in abstractions
..
Remove temporary hole in abstractions
Was introduced temprarily to facilitate event logging, now the only caller is
gone.
Bug: T166247
Change-Id: I0f9cdccc6b3a566d9f7ebf02515f724348205071
---
M includes/user/User.php
1 file changed, 0 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/19/365419/1
diff --git a/includes/user/User.php b/includes/user/User.php
index a1119fa..7bf6be5 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -305,12 +305,6 @@
/** @var integer User::READ_* constant bitfield used to load data */
protected $queryFlagsUsed = self::READ_NORMAL;
- /** @var string Indicates type of block (used for eventlogging)
-* Permitted values: 'cookie-block', 'proxy-block', 'openproxy-block',
'xff-block',
-* 'config-block'
-*/
- public $blockTrigger = false;
-
public static $idCacheByName = [];
/**
@@ -1676,7 +1670,6 @@
'address' => $ip,
'systemBlock' => 'proxy',
] );
- $this->blockTrigger = 'proxy-block';
} elseif ( $this->isAnon() && $this->isDnsBlacklisted(
$ip ) ) {
$block = new Block( [
'byText' => wfMessage( 'sorbs'
)->text(),
@@ -1684,7 +1677,6 @@
'address' => $ip,
'systemBlock' => 'dnsbl',
] );
- $this->blockTrigger = 'openproxy-block';
}
}
@@ -1703,7 +1695,6 @@
# Mangle the reason to alert the user that the
block
# originated from matching the X-Forwarded-For
header.
$block->mReason = wfMessage( 'xffblockreason',
$block->mReason )->text();
- $this->blockTrigger = 'xff-block';
}
}
@@ -1719,7 +1710,6 @@
'anonOnly' => true,
'systemBlock' => 'wgSoftBlockRanges',
] );
- $this->blockTrigger = 'config-block';
}
if ( $block instanceof Block ) {
@@ -1733,7 +1723,6 @@
$this->mBlockedby = '';
$this->mHideName = 0;
$this->mAllowUsertalk = false;
- $this->blockTrigger = false;
}
// Avoid PHP 7.1 warning of passing $this by reference
@@ -1766,7 +1755,6 @@
$useBlockCookie = ( $config->get(
'CookieSetOnAutoblock' ) === true );
if ( $blockIsValid && $useBlockCookie ) {
// Use the block.
- $this->blockTrigger = 'cookie-block';
return $tmpBlock;
} else {
// If the block is not valid, remove
the cookie.
--
To view, visit https://gerrit.wikimedia.org/r/365419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f9cdccc6b3a566d9f7ebf02515f724348205071
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
