Test fix - get rid of exta api.aliases

diff --git a/CRM/Contact/Page/View/Summary.php b/CRM/Contact/Page/View/Summary.php
index 94154ef9f9136359be267006b03c77b272823017..35f1ed021b9ffd9194e524a9a3d0fb19e6b2505e 100644 (file)
--- a/CRM/Contact/Page/View/Summary.php
+++ b/CRM/Contact/Page/View/Summary.php
@@ -179,7 +179,7 @@ class CRM_Contact_Page_View_Summary extends CRM_Contact_Page_View {
           CRM_Utils_Array::lookupValue($val, 'location_type', CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id', array('labelColumn' => 'display_name')), FALSE);
           if (!CRM_Utils_Array::value('skip', $value)) {
             $daoName = $value['daoName'];
-            $pseudoConst = $daoName::buildOptions($value['fieldName'], 'view');
+            $pseudoConst = $daoName::buildOptions($value['fieldName'], 'get');
             CRM_Utils_Array::lookupValue($val, $value['id'], $pseudoConst, FALSE);
           }
         }

diff --git a/api/v3/Generic.php b/api/v3/Generic.php
index 13efcc119cb4d306043ca8d6326ec69eabd9ae7b..1e17e92079a1a633562fc1ee79782f64c30915e9 100644 (file)
--- a/api/v3/Generic.php
+++ b/api/v3/Generic.php
@@ -245,10 +245,6 @@ function _civicrm_api3_generic_get_metadata_options(&$metadata, $entity, $fieldn
     return;
   }
 
-  if(substr($fieldname, -3) == '_id'){
-    $metadata[$fieldname]['api.aliases'][] = substr($fieldname, 0, -3);
-  }
-
   if (!empty($metadata[$fieldname]['options']) || !in_array($fieldname, $fieldsToResolve)) {
     return;
   }