Merge pull request #4629 from systopia/CRM-15665

[civicrm-core.git] / CRM / Badge / BAO / Badge.php

diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php
index eca1c03461cd25b91c07f970dfaf0f9430b1ee0c..cf0f1f97abd511ce2d461549dc14ca609d077737 100644 (file)
--- a/CRM/Badge/BAO/Badge.php
+++ b/CRM/Badge/BAO/Badge.php
@@ -394,11 +394,10 @@ class CRM_Badge_BAO_Badge {
   }
 
   /**
-   * function to build badges parameters before actually creating badges.
+   * Build badges parameters before actually creating badges.
    *
    * @param  array $params associated array of submitted values
-   * @param $form
-   * @params object $form form/controller object
+   * @param CRM_Core_Form $form
    *
    * @return void
    * @access public
@@ -408,7 +407,7 @@ class CRM_Badge_BAO_Badge {
     // get name badge layout info
     $layoutInfo = CRM_Badge_BAO_Layout::buildLayout($params);
 
-    // spit / get actual field names from tokeni and individual contact image URLs
+    // split/get actual field names from token and individual contact image URLs
     $returnProperties = array();
     if (!empty($layoutInfo['data']['token'])) {
       foreach ($layoutInfo['data']['token'] as $index => $value) {
@@ -475,12 +474,7 @@ class CRM_Badge_BAO_Badge {
     $dao = CRM_Core_DAO::executeQuery($queryString);
     $rows = array();
     while ($dao->fetch()) {
-      if (!empty($dao->country_id)) {
-        $dao->country = CRM_Core_PseudoConstant::country($dao->country_id);
-      }
-      if (!empty($dao->state_province_id)) {
-        $dao->state_province = CRM_Core_PseudoConstant::stateProvince($dao->state_province_id);
-      }
+      $query->convertToPseudoNames($dao);
       $rows[$dao->participant_id] = array();
       foreach ($returnProperties as $key => $dontCare) {
         $rows[$dao->participant_id][$key] = isset($dao->$key) ? $dao->$key : NULL;