wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-24 22:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "build: Updating mediawiki/mediawiki-phan-config to 0.10.2"

Browse source
This commit is contained in:
jenkins-bot 2020-06-03 15:59:30 +00:00 committed by Gerrit Code Review
parent 02120ab7b7 ef7f867f35
commit a9dd435adb
5 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
composer.json
View file

@ -10,7 +10,7 @@
},
"require-dev": {
"mediawiki/mediawiki-codesniffer": "31.0.0",
"mediawiki/mediawiki-phan-config": "0.9.1",
"mediawiki/mediawiki-phan-config": "0.10.2",
"mediawiki/minus-x": "1.0.0",
"php-parallel-lint/php-console-highlighter": "0.5.0",
"php-parallel-lint/php-parallel-lint": "1.2.0"
@ -25,8 +25,5 @@
"phpcs -p -s",
"minus-x check ."
]
},
"extra": {
"phan-taint-check-plugin": "2.0.1"
}
}

4
includes/AbuseFilter.php
View file

@ -1571,7 +1571,7 @@ class AbuseFilter {
/**
* @param string $action
* @return string
* @return string HTML
*/
public static function getActionDisplay( $action ) {
// Give grep a chance to find the usages:
@ -1579,7 +1579,7 @@ class AbuseFilter {
// abusefilter-action-blockautopromote, abusefilter-action-block, abusefilter-action-degroup,
// abusefilter-action-rangeblock, abusefilter-action-disallow
$display = wfMessage( "abusefilter-action-$action" )->escaped();
$display = wfMessage( "abusefilter-action-$action", $display )->isDisabled()
$display = wfMessage( "abusefilter-action-$action" )->rawParams( $display )->isDisabled()
? htmlspecialchars( $action )
: $display;

8
includes/AbuseLogHitFormatter.php
View file

@ -40,11 +40,11 @@ class AbuseLogHitFormatter extends LogFormatter {
) );
}
$actions_taken = $entry['actions'];
if ( !strlen( trim( $actions_taken ) ) ) {
$actions_takenRaw = $entry['actions'];
if ( !strlen( trim( $actions_takenRaw ) ) ) {
$actions_taken = $this->msg( 'abusefilter-log-noactions' );
} else {
$actions = explode( ',', $actions_taken );
$actions = explode( ',', $actions_takenRaw );
$displayActions = [];
foreach ( $actions as $action ) {
@ -52,7 +52,7 @@ class AbuseLogHitFormatter extends LogFormatter {
}
$actions_taken = $this->context->getLanguage()->commaList( $displayActions );
}
$params[5] = $actions_taken;
$params[5] = Message::rawParam( $actions_taken );
// Bad things happen if the numbers are not in correct order
ksort( $params );

3
includes/Views/AbuseFilterView.php
View file

@ -237,7 +237,7 @@ abstract class AbuseFilterView extends ContextSource {
/**
* @param IDatabase $db
* @param string|bool $action 'edit', 'move', 'createaccount', 'delete' or false for all
* @param string|false $action 'edit', 'move', 'createaccount', 'delete' or false for all
* @return string
*/
public function buildTestConditions( IDatabase $db, $action = false ) {
@ -279,6 +279,7 @@ abstract class AbuseFilterView extends ContextSource {
// Done later
break;
default:
// @phan-suppress-next-line PhanTypeSuspiciousStringExpression False does not reach here
throw new MWException( __METHOD__ . ' called with invalid action: ' . $action );
}

12
includes/special/SpecialAbuseLog.php
View file

@ -1079,13 +1079,13 @@ class SpecialAbuseLog extends AbuseFilterSpecialPage {
$userLink .= ' (' . WikiMap::getWikiName( $row->afl_wiki ) . ')';
}
$timestamp = $lang->timeanddate( $row->afl_timestamp, true );
$timestamp = htmlspecialchars( $lang->timeanddate( $row->afl_timestamp, true ) );
$actions_taken = $row->afl_actions;
if ( !strlen( trim( $actions_taken ) ) ) {
$actions_takenRaw = $row->afl_actions;
if ( !strlen( trim( $actions_takenRaw ) ) ) {
$actions_taken = $this->msg( 'abusefilter-log-noactions' )->escaped();
} else {
$actions = explode( ',', $actions_taken );
$actions = explode( ',', $actions_takenRaw );
$displayActions = [];
foreach ( $actions as $action ) {
@ -1158,7 +1158,7 @@ class SpecialAbuseLog extends AbuseFilterSpecialPage {
$timestamp,
$userLink,
$filterLink,
$row->afl_action,
htmlspecialchars( $row->afl_action ),
$pageLink,
$actions_taken,
$escaped_comments,
@ -1173,7 +1173,7 @@ class SpecialAbuseLog extends AbuseFilterSpecialPage {
$description = $this->msg( $msg )->rawParams(
$timestamp,
$userLink,
$row->afl_action,
htmlspecialchars( $row->afl_action ),
$pageLink,
$actions_taken,
$escaped_comments,