remove name_id property

diff --git a/CRM/Contact/Form/DedupeRules.php b/CRM/Contact/Form/DedupeRules.php
index a99502a89012330c767d2856c01e78f6c31f829d..d7df3d47d016c9214f2add353066dc0278b4fb79 100644 (file)
--- 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 6bd0e207009bb014512643489a2fdc29d0cfcfa5..a5d2550283d3a18fcb79fbeead44ea23a8a4d5c7 100644 (file)
--- 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') {