CRM-14463 - Fix custom address fields to support location type

[civicrm-core.git] / CRM / Core / BAO / Location.php

diff --git a/CRM/Core/BAO/Location.php b/CRM/Core/BAO/Location.php
index 396857b8cd00cb6bc51bd148311c20c52339f75e..44e06bbfdd25c5da8d31af6569aaddb7d43dfb24 100644 (file)
--- a/CRM/Core/BAO/Location.php
+++ b/CRM/Core/BAO/Location.php
@@ -1,7 +1,7 @@
 <?php
 /*
   +--------------------------------------------------------------------+
-  | CiviCRM version 4.3                                                |
+  | CiviCRM version 4.4                                                |
   +--------------------------------------------------------------------+
   | Copyright CiviCRM LLC (c) 2004-2013                                |
   +--------------------------------------------------------------------+
@@ -198,8 +198,8 @@ WHERE e.id = %1";
     $locBlock->delete();
     foreach ($store as $daoName => $id) {
       if ($id) {
-        $daoName = substr($daoName, 0, -2);
-        eval('$dao = new CRM_Core_DAO_' . $daoName . '( );');
+        $daoName = 'CRM_Core_DAO_' . substr($daoName, 0, -2);
+        $dao = new $daoName();
         $dao->id = $id;
         $dao->find(TRUE);
         $dao->delete();
@@ -245,7 +245,7 @@ WHERE e.id = %1";
     if (empty($entityBlock)) {
       return NULL;
     }
-
+    $blocks = array();
     $name_map = array(
       'im' => 'IM',
       'openid' => 'OpenID',
@@ -259,7 +259,7 @@ WHERE e.id = %1";
       else {
         $name = ucfirst($block);
       }
-      $baoString = 'CRM_Core_BAO_' . $name ;
+      $baoString = 'CRM_Core_BAO_' . $name;
       $blocks[$block] = $baoString::getValues( $entityBlock, $microformat );
     }
     return $blocks;