From 2b3f70dbaddf2d85686256a9a133a01e4a45eace Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Thu, 23 Aug 2012 11:16:24 +0100 Subject: [PATCH] MDL-35023 qtype calculated: fix strict syntax problem. --- question/type/calculated/questiontype.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/question/type/calculated/questiontype.php b/question/type/calculated/questiontype.php index 9083ae3d53b..2ffb7d5f8b6 100644 --- a/question/type/calculated/questiontype.php +++ b/question/type/calculated/questiontype.php @@ -1701,17 +1701,19 @@ class qtype_calculated extends question_type { 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; } } }