Mwalker has submitted this change and it was merged.
Change subject: Removing a super-annoying log line, and preventing a frequent
warning.
......................................................................
Removing a super-annoying log line, and preventing a frequent warning.
Change-Id: I7823824f3c7cd896283a82c21a43dfd4014df885
---
M sites/all/modules/globalcollect_audit/globalcollect_audit.module
M sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
Mwalker: Verified; Looks good to me, approved
diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index 879cc81..9f3569b 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -165,7 +165,7 @@
}
$matches =
wmf_civicrm_get_child_contributions_from_gateway_id( 'globalcollect',
wr1_order_id( $transactions[$order_id] ) );
- if ( !$error && count( $matches ) ) {
+ if ( !$error && is_array( $matches ) && count(
$matches ) ) {
$im_a = wmf_civicrm_get_civi_id(
'contribution_type_id', wr1_get_negative_type( $transactions[$order_id] ) );
foreach ( $matches as $match ) {
//None of these are themselves
parents.
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
index ce2eadd..920de4f 100644
--- a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
@@ -349,7 +349,6 @@
$dummy = array();
if(array_key_exists($type, $civi_ids) && array_key_exists($name,
$civi_ids[$type])) {
- watchdog('wmf_civicrm', "Already looked up $type - $name. Returning id
" . $civi_ids[$type][$name]);
return $civi_ids[$type][$name];
}
--
To view, visit https://gerrit.wikimedia.org/r/92981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7823824f3c7cd896283a82c21a43dfd4014df885
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Katie Horn <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
