moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
skodak 2009-09-28 16:08:17 +00:00
parent 21e4f4b212
commit 1e123f47d8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/data/lib.php
View file

@ -644,7 +644,7 @@ function data_append_new_field_to_templates($data, $newfieldname) {
function data_get_field_from_name($name, $data){ function data_get_field_from_name($name, $data){
global $DB; 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) { if ($field) {
return data_get_field($field, $data); 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){ function data_get_field_from_id($fieldid, $data){
global $DB; 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) { if ($field) {
return data_get_field($field, $data); return data_get_field($field, $data);