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

Merge "Use string cast for Postgres compatibility"

Browse source
This commit is contained in:
jenkins-bot 2019-04-11 21:50:06 +00:00 committed by Gerrit Code Review
parent c0da9ff3ac 4ab12305f1
commit ca6ef32a69
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/api/ApiQueryAbuseLog.php
View file

@ -97,11 +97,12 @@ class ApiQueryAbuseLog extends ApiQueryBase {
$this->addFieldsIf( 'afl_actions', $fld_result );
$this->addFieldsIf( 'afl_wiki', $fld_wiki );
$db = $this->getDB();
if ( $fld_filter ) {
$this->addTables( 'abuse_filter' );
$this->addFields( 'af_public_comments' );
$this->addJoinConds( [ 'abuse_filter' => [ 'LEFT JOIN',
'af_id=afl_filter' ] ] );
$db->buildStringCast( 'af_id' ) . '=afl_filter' ] ] );
}
$this->addOption( 'LIMIT', $params['limit'] + 1 );

2
includes/pagers/AbuseLogPager.php
View file

@ -45,7 +45,7 @@ class AbuseLogPager extends ReverseChronologicalPager {
[ 'abuse_filter' =>
[
'LEFT JOIN',
'af_id=afl_filter',
$this->mDb->buildStringCast( 'af_id' ) . '=afl_filter',
],
],
];

6
includes/special/SpecialAbuseLog.php
View file

@ -320,7 +320,7 @@ class SpecialAbuseLog extends SpecialPage {
[ 'afl_id' => $id ],
__METHOD__,
[],
[ 'abuse_filter' => [ 'LEFT JOIN', 'af_id=afl_filter' ] ]
[ 'abuse_filter' => [ 'LEFT JOIN', $dbr->buildStringCast( 'af_id' ) . '=afl_filter' ] ]
);
if ( !$row ) {
@ -572,7 +572,7 @@ class SpecialAbuseLog extends SpecialPage {
[ 'afl_id' => $id ],
__METHOD__,
[],
[ 'abuse_filter' => [ 'LEFT JOIN', 'af_id=afl_filter' ] ]
[ 'abuse_filter' => [ 'LEFT JOIN', $dbr->buildStringCast( 'af_id' ) . '=afl_filter' ] ]
);
$error = null;
@ -707,7 +707,7 @@ class SpecialAbuseLog extends SpecialPage {
[ 'afl_id' => $id ],
__METHOD__,
[],
[ 'abuse_filter' => [ 'LEFT JOIN', 'af_id=afl_filter' ] ]
[ 'abuse_filter' => [ 'LEFT JOIN', $dbr->buildStringCast( 'af_id' ) . '=afl_filter' ] ]
);
$error = null;