From 7d8cede29c83394d76c6f72da748a3dd4ac5a30f Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Mon, 28 Sep 2009 16:07:19 +0000
Subject: [PATCH] MDL-20369 fixed incorrect fetching of data fields - this was
 causing major problem with incorrect defaultsort caused by restore bug

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

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 4cdf96224d3..d3fea95f54c 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -482,7 +482,7 @@ function data_append_new_field_to_templates($data, $newfieldname) {
  * this function creates an instance of the particular subfield class   *
  ************************************************************************/
 function data_get_field_from_name($name, $data){
-    $field = get_record('data_fields','name',$name);
+    $field = get_record('data_fields', 'name', $name, 'dataid', $data->id);
     if ($field) {
         return data_get_field($field, $data);
     } else {
@@ -495,7 +495,7 @@ function data_get_field_from_name($name, $data){
  * this function creates an instance of the particular subfield class   *
  ************************************************************************/
 function data_get_field_from_id($fieldid, $data) {
-    $field = get_record('data_fields','id',$fieldid);
+    $field = get_record('data_fields', 'id', $fieldid, 'dataid', $data->id);
     if ($field) {
         return data_get_field($field, $data);
     } else {