Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-14-22-39-05

[civicrm-core.git] / api / v3 / EntityTag.php

diff --git a/api/v3/EntityTag.php b/api/v3/EntityTag.php
index 62409dcb4706ce2777e54def02913f280ffde561..3367acf8119eba883802ec7d19c1f728946eca02 100644 (file)
--- a/api/v3/EntityTag.php
+++ b/api/v3/EntityTag.php
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /*
  +--------------------------------------------------------------------+
@@ -98,7 +97,7 @@ function civicrm_api3_entity_tag_display($params) {
 
   $values = CRM_Core_BAO_EntityTag::getTag($entityID, $entityTable);
   $result = array();
-  $tags   = CRM_Core_PseudoConstant::tag();
+  $tags   = CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', array('onlyActive' => FALSE));
   foreach ($values as $v) {
     $result[] = $tags[$v];
   }