From a1ecd20a199f53545dbe0589264b4b6beb9ff65b Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Mon, 14 Aug 2006 09:01:31 +0000
Subject: [PATCH] Merged fixes from HEAD

---
 mod/data/import.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/data/import.php b/mod/data/import.php
index fed188a2ea9..1359195ca8b 100755
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -115,7 +115,7 @@
             $fieldnames = array_shift($records);
             
             foreach ($records as $record) {
-                if ($recordid = data_add_record($data->id, 0)) {  // add instance to data_record
+                if ($recordid = data_add_record($data, 0)) {  // add instance to data_record
                     $fields = get_records('data_fields', 'dataid', $data->id, '', 'name, id, type');
                     
                     // do a manual round of inserting, to make sure even empty contents get stored
@@ -132,7 +132,7 @@
                         $newfield = 'data_field_'.$field->type;
                         $currentfield = new $newfield($field->id);
 
-                        $currentfield->update_data_content($currentfield->id, $recordid, $value, $name);
+                        $currentfield->update_content($recordid, $value, $name);
                     }
                     $recordsadded++;
                 }