jenkins-bot has submitted this change and it was merged.

Change subject: Avoid connecting to central database when not necessary
......................................................................


Avoid connecting to central database when not necessary

When using SQLite, this fails entirely. But it's a good idea for all
databases.

Bug: 54078
Change-Id: I2cc2e57d812fe87ffc227477425029c1e9b15543
---
M AbuseFilter.hooks.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Anomie: Looks good to me, approved
  jenkins-bot: Verified



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() ),

-- 
To view, visit https://gerrit.wikimedia.org/r/84185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cc2e57d812fe87ffc227477425029c1e9b15543
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: CSteipp <cste...@wikimedia.org>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: Werdna <agarr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to