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

Change subject: Initialize smashpig context on-demand
......................................................................


Initialize smashpig context on-demand

_init was running even for batch jobs, seems to have broken something.

Avoiding any mention of 'init' in the function name coz scared of
Drupal voodoo

Change-Id: I8ad6d123b1bdef8aa951eb82981fed14e9b126e2
---
M sites/all/modules/wmf_common/wmf_common.module
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/sites/all/modules/wmf_common/wmf_common.module 
b/sites/all/modules/wmf_common/wmf_common.module
index 6d00326..e3306a9 100644
--- a/sites/all/modules/wmf_common/wmf_common.module
+++ b/sites/all/modules/wmf_common/wmf_common.module
@@ -506,6 +506,7 @@
 }
 
 function wmf_common_damaged_confirm_delete_submit( $form, &$form_state ) {
+       wmf_common_create_smashpig_context();
        $ids = explode( ',', $form['#ids'] );
        $ddb = DamagedDatabase::get();
        foreach( $ids as $id ) {
@@ -598,6 +599,7 @@
 function wmf_common_damaged_item_submit( $form, &$form_state ) {
        $delete = false;
        $id = $form_state['values']['damaged_id'];
+       wmf_common_create_smashpig_context();
 
        switch ( $form_state['values']['op'] ) {
                case $form_state['values']['resend']:
@@ -634,7 +636,7 @@
        }
 }
 
-function wmf_common_init() {
+function wmf_common_create_smashpig_context() {
        // Initialize SmashPig
        $config = Configuration::createForView();
        Context::initWithLogger( $config, 'wmf_common' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ad6d123b1bdef8aa951eb82981fed14e9b126e2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to