X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FAdmin%2FPage%2FAJAX.php;h=4374d62403c4ff5501c8f75eafe52d9b8449dec6;hb=4fcc98770643f94433aa39cde9b787a9d9a9e9e7;hp=139321abe4f53c552938678ee2c1448d47f09a50;hpb=b733747a3397f585160e3ca0b950308ff28188a6;p=civicrm-core.git

diff --git a/CRM/Admin/Page/AJAX.php b/CRM/Admin/Page/AJAX.php
index 139321abe4..4374d62403 100644
--- a/CRM/Admin/Page/AJAX.php
+++ b/CRM/Admin/Page/AJAX.php
@@ -266,7 +266,7 @@ class CRM_Admin_Page_AJAX {
 
     // query to list mergable tags
     $query = "
-SELECT t1.name, t1.id, t1.used_for, t2.name as parent
+SELECT t1.name, t1.id, t1.used_for, t1.color, t2.name as parent
 FROM   civicrm_tag t1
 LEFT JOIN civicrm_tag t2 ON t1.parent_id = t2.id
 WHERE  t1.id <> {$fromId} AND
@@ -280,6 +280,7 @@ LIMIT $limit";
       $row = array(
         'id' => $dao->id,
         'text' => ($dao->parent ? "{$dao->parent} :: " : '') . $dao->name,
+        'color' => isset($dao->color) ? $dao->color : NULL,
       );
       // Add warning about used_for types
       if (!empty($dao->used_for)) {