X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FMigrate%2FImportJSON.php;h=f39587968bc16b691455506826796c835f6188f4;hb=c15fb38374462a40d704d83fac983412df8a16a1;hp=fd26acae5c504ceced8e4b773e6e5a33224922ff;hpb=e9aca61e8b08d5ae372621c4397108b8f2ec28ba;p=civicrm-core.git diff --git a/CRM/Utils/Migrate/ImportJSON.php b/CRM/Utils/Migrate/ImportJSON.php index fd26acae5c..f39587968b 100644 --- a/CRM/Utils/Migrate/ImportJSON.php +++ b/CRM/Utils/Migrate/ImportJSON.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 4.6 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2014 | + | Copyright CiviCRM LLC (c) 2004-2015 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -23,12 +23,12 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2014 + * @copyright CiviCRM LLC (c) 2004-2015 * $Id$ * */ @@ -39,7 +39,6 @@ class CRM_Utils_Migrate_ImportJSON { protected $_saveMapping; /** - * */ public function __construct() { $this->_lookupCache = array(); @@ -209,7 +208,7 @@ class CRM_Utils_Migrate_ImportJSON { * @param null $dateFields */ public function restore(&$chunk, $daoName, $lookUpMapping = NULL, $dateFields = NULL) { - $object = new $daoName(); + $object = new $daoName(); $tableName = $object->__table; if (is_array($lookUpMapping)) { @@ -227,7 +226,7 @@ class CRM_Utils_Migrate_ImportJSON { $columns = $chunk[0]; foreach ($chunk as $key => $value) { if ($key) { - $object = new $daoName(); + $object = new $daoName(); foreach ($columns as $k => $column) { if ($column == 'id') { $childID = $value[$k]; @@ -300,4 +299,5 @@ WHERE entity_table = '{$tableName}' $this->_lookupCache[$dao->slave_id] = $dao->master_id; } } + }