Permalink
Browse files

Merge branch 'MDL-35023_22' of git://github.com/timhunt/moodle into M…

…OODLE_22_STABLE
  • Loading branch information...
stronk7 committed Aug 27, 2012
2 parents aa81647 + e60c61e commit c06b18a47554bbb4ebeb815ba46db70972619db9
Showing with 8 additions and 6 deletions.
  1. +8 −6 question/type/calculated/questiontype.php
@@ -1697,17 +1697,19 @@ public function print_dataset_definitions_category_shared($question, $datasetdef
WHERE i.id = d.datasetdefinition AND i.category = ?";
if ($records = $DB->get_records_sql($sql, array($category))) {
foreach ($records as $r) {
+ $key = "$r->type-$r->category-$r->name";
$sql1 = "SELECT q.*
FROM {question} q
WHERE q.id = ?";
- if (!isset ($datasetdefs["$r->type-$r->category-$r->name"])) {
- $datasetdefs["$r->type-$r->category-$r->name"]= $r;
+ if (!isset($datasetdefs[$key])) {
+ $datasetdefs[$key] = $r;
}
if ($questionb = $DB->get_records_sql($sql1, array($r->question))) {
- $datasetdefs["$r->type-$r->category-$r->name"]->questions[
- $r->question]->name = $questionb[$r->question]->name;
- $datasetdefs["$r->type-$r->category-$r->name"]->questions[
- $r->question]->id = $questionb[$r->question]->id;
+ $datasetdefs[$key]->questions[$r->question] = new stdClass();
+ $datasetdefs[$key]->questions[$r->question]->name =
+ $questionb[$r->question]->name;
+ $datasetdefs[$key]->questions[$r->question]->id =
+ $questionb[$r->question]->id;
}
}
}

0 comments on commit c06b18a

Please sign in to comment.