From 9f6451015282bd74235f37cfab6d8d69a65239e9 Mon Sep 17 00:00:00 2001 From: Tim Mallezie Date: Wed, 22 Apr 2015 09:12:43 +0200 Subject: [PATCH] remove name_id property --- CRM/Contact/Form/DedupeRules.php | 4 ++-- CRM/Core/Form.php | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CRM/Contact/Form/DedupeRules.php b/CRM/Contact/Form/DedupeRules.php index a99502a890..d7df3d47d0 100644 --- a/CRM/Contact/Form/DedupeRules.php +++ b/CRM/Contact/Form/DedupeRules.php @@ -130,8 +130,8 @@ class CRM_Contact_Form_DedupeRules extends CRM_Admin_Form { NULL => ts('- none -'), ) + $this->_fields, FALSE, $disabled ); - $this->addField('rule_length', array('entity' => 'Rule', 'name_id' => "length_$count") + $attributes); - $this->addField('rule_weight', array('entity' => 'Rule', 'name_id' => "weight_$count") + $attributes); + $this->addField("length_$count", array('entity' => 'Rule', 'name' => 'rule_length') + $attributes); + $this->addField("weight_$count", array('entity' => 'Rule', 'name' => 'rule_weight') + $attributes); } $this->addField('threshold', array('label' => ts("Weight Threshold to Consider Contacts 'Matching':")) + $attributes); diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php index 6bd0e20700..a5d2550283 100644 --- a/CRM/Core/Form.php +++ b/CRM/Core/Form.php @@ -1178,7 +1178,6 @@ class CRM_Core_Form extends HTML_QuickForm_Page { $fieldSpec = civicrm_api3($props['entity'], 'getfield', $props); $fieldSpec = $fieldSpec['values']; $label = CRM_Utils_Array::value('label', $props, isset($fieldSpec['title']) ? $fieldSpec['title'] : NULL); - $name = isset($props['name_id']) ? $props['name_id'] : $name; $widget = isset($props['type']) ? $props['type'] : $fieldSpec['html']['type']; if ($widget == 'TextArea' && $props['context'] == 'search') { -- 2.25.1