Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84185
Change subject: Fix SQLite being incompatible with AbuseFilter
......................................................................
Fix SQLite being incompatible with AbuseFilter
For the sake of SQLite compatibility, ensure all flag variables are either
0 or 1, and don't connect to a central database unless one exists.
Bug: 54078
Change-Id: I2cc2e57d812fe87ffc227477425029c1e9b15543
---
M AbuseFilter.hooks.php
M Views/AbuseFilterViewEdit.php
M special/SpecialAbuseLog.php
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/85/84185/1
diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
index 0f1fe9a..c042452 100644
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -242,10 +242,10 @@
if ( $vars->getVar('global_log_ids') ) {
$log_ids = $vars->getVar('global_log_ids')->toNative();
- global $wgAbuseFilterCentralDB;
- $fdb = wfGetDB( DB_MASTER, array(),
$wgAbuseFilterCentralDB );
-
if ( count($log_ids) ) {
+ global $wgAbuseFilterCentralDB;
+ $fdb = wfGetDB( DB_MASTER, array(),
$wgAbuseFilterCentralDB );
+
$fdb->update( 'abuse_filter_log',
array( 'afl_rev_id' =>
$revision->getId() ),
array( 'afl_id' => $log_ids, 'afl_wiki'
=> wfWikiId() ),
diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index c71747e..e41b395 100644
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -145,7 +145,7 @@
}
// Reset throttled marker, if we're re-enabling it.
- $newRow['af_throttled'] = $newRow['af_throttled'] &&
!$newRow['af_enabled'];
+ $newRow['af_throttled'] = $newRow['af_throttled'] &&
!$newRow['af_enabled'] ? 1 : 0;
$newRow['af_id'] = $new_id; // ID.
$dbw->replace( 'abuse_filter', array( 'af_id' ),
$newRow, __METHOD__ );
@@ -918,11 +918,11 @@
$row->af_group = $request->getVal( 'wpFilterGroup',
'default' );
- $row->af_deleted = $request->getBool( 'wpFilterDeleted'
);
- $row->af_enabled = $request->getBool( 'wpFilterEnabled'
) && !$row->af_deleted;
- $row->af_hidden = $request->getBool( 'wpFilterHidden' );
+ $row->af_deleted = $request->getBool( 'wpFilterDeleted'
) ? 1 : 0;
+ $row->af_enabled = $request->getBool( 'wpFilterEnabled'
) && !$row->af_deleted ? 1 : 0;
+ $row->af_hidden = $request->getBool( 'wpFilterHidden' )
? 1 : 0;
global $wgAbuseFilterIsCentral;
- $row->af_global = $request->getBool( 'wpFilterGlobal' )
&& $wgAbuseFilterIsCentral;
+ $row->af_global = $request->getBool( 'wpFilterGlobal' )
&& $wgAbuseFilterIsCentral ? 1 : 0;
// Actions
global $wgAbuseFilterAvailableActions;
diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index fe45547..bbac1e2 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -185,7 +185,7 @@
$dbw->update(
'abuse_filter_log',
- array( 'afl_deleted' => $fields['hidden'] ),
+ array( 'afl_deleted' => $fields['hidden'] ? 1 : 0 ),
array( 'afl_id' => $logid ),
__METHOD__
);
--
To view, visit https://gerrit.wikimedia.org/r/84185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cc2e57d812fe87ffc227477425029c1e9b15543
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
