From 1e123f47d85e15b648324667f4f833ca79e3ab13 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Mon, 28 Sep 2009 16:08:17 +0000
Subject: [PATCH] MDL-20369 fixed incorrect fetching of data fields - this was
 causing major problem with incorrect defaultsort caused by restore bug;
 merged from MOODLE_19_STABLE

---
 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 4b288ad5ac..2df18f32c6 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -644,7 +644,7 @@ function data_append_new_field_to_templates($data, $newfieldname) {
 function data_get_field_from_name($name, $data){
     global $DB;
 
-    $field = $DB->get_record('data_fields', array('name'=>$name));
+    $field = $DB->get_record('data_fields', array('name'=>$name, 'dataid'=>$data->id));
 
     if ($field) {
         return data_get_field($field, $data);
@@ -665,7 +665,7 @@ function data_get_field_from_name($name, $data){
 function data_get_field_from_id($fieldid, $data){
     global $DB;
 
-    $field = $DB->get_record('data_fields', array('id'=>$fieldid));
+    $field = $DB->get_record('data_fields', array('id'=>$fieldid, 'dataid'=>$data->id));
 
     if ($field) {
         return data_get_field($field, $data);
-- 
2.39.5