From 0c1e1321d30a690b8bfaa0103a8cd3d653008cca Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sun, 18 Sep 2016 14:25:22 +1000 Subject: [PATCH] Fix doc bloc entry --- CRM/Admin/Form/Options.php | 4 ++-- CRM/Core/OptionValue.php | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CRM/Admin/Form/Options.php b/CRM/Admin/Form/Options.php index 67718e52f3..d7e38155b7 100644 --- a/CRM/Admin/Form/Options.php +++ b/CRM/Admin/Form/Options.php @@ -177,8 +177,8 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form { 'addressee', )) && !$isReserved ) { - $domainSepcificOptionGroups = array('from_email_address'); - $domainSpecific = in_array($this->_gName, $domainSepcificOptionGroups) ? TRUE : FALSE; + $domainSpecificOptionGroups = array('from_email_address'); + $domainSpecific = in_array($this->_gName, $domainSpecificOptionGroups) ? TRUE : FALSE; $this->addRule('label', ts('This Label already exists in the database for this option group. Please select a different Value.'), 'optionExists', diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php index f4f264172a..576227da87 100644 --- a/CRM/Core/OptionValue.php +++ b/CRM/Core/OptionValue.php @@ -259,8 +259,10 @@ class CRM_Core_OptionValue { * @param string $fieldName * The name of the field in the DAO. * @param bool $domainSpecific - * Dos this option groujp allow for duplicate options that are - * in separate domain. + * Filter this check to the current domain. + * Some optionGroups allow for same labels or same names but + * they must be in different domains, so filter the check to + * the current domain. * * @return bool * true if object exists -- 2.25.1