jenkins-bot has submitted this change and it was merged.
Change subject: Only delete option groups that exist
......................................................................
Only delete option groups that exist
Change-Id: Ia533066526bfcab8e2e8bc1870e1c2307b8f146c
---
M CRM/Core/BAO/CustomField.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index f414984..bbd84f7 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -2050,8 +2050,10 @@
return;
}
- // check if option group is related to any other field
- self::checkOptionGroup($currentOptionGroupId);
+ if ($currentOptionGroupId) {
+ // check if option group is related to any other field
+ self::checkOptionGroup($currentOptionGroupId);
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/219495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia533066526bfcab8e2e8bc1870e1c2307b8f146c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
