CRM-12449

----------------------------------------
* CRM-12449: On the import page, the dedupe rules select isn't using the rules' names
  http://issues.civicrm.org/jira/browse/CRM-12449

diff --git a/CRM/Dedupe/BAO/RuleGroup.php b/CRM/Dedupe/BAO/RuleGroup.php
index 01298f45eb2648274ae0199a67eb3cbbf3e1407b..1c2e1a84318b7db0e543a51adc45066cab7d659b 100644 (file)
--- a/CRM/Dedupe/BAO/RuleGroup.php
+++ b/CRM/Dedupe/BAO/RuleGroup.php
@@ -411,12 +411,11 @@ class CRM_Dedupe_BAO_RuleGroup extends CRM_Dedupe_DAO_RuleGroup {
     $dao->find();
     $result = array();
     while ($dao->fetch()) {
-      if (!empty($dao->name)) {
-        $name = "{$dao->name} - {$dao->used}";
-      }
-      else {
-        $name = "{$dao->contact_type} - {$dao->used}";
-      }
+      $title =
+        !empty($dao->title) ? $dao->title :
+        (!empty($dao->name)  ? $dao->name : $dao->contact_type);
+
+      $name = "$title - {$dao->used}";
       $result[$dao->id] = $name;
     }
     return $result;