mirror of
https://github.com/moodle/moodle.git
synced 2025-08-07 01:46:45 +02:00
Changes throughout Moodle to remove any reserved words from the
Moodle tables. ie user -> userid in many tables, plus in user_students start -> starttime and end -> endtime I've just done all this as carefully as I could ... I don't think I missed anything but it's pretty intensive work and I'd be fooling myself if I didn't think I'd missed a couple. Note that this version should pretty much be able to bootstrap itself using PostgreSQL now ... but this is untested
This commit is contained in:
parent
1f48942e7d
commit
ebc3bd2b24
68 changed files with 277 additions and 461 deletions
|
@ -94,15 +94,15 @@
|
|||
}
|
||||
|
||||
foreach ($aaa as $a) {
|
||||
if (!$results["$a->user"]) { // init new array
|
||||
$results["$a->user"]["time"] = $a->time;
|
||||
if (!$results["$a->userid"]) { // init new array
|
||||
$results["$a->userid"]["time"] = $a->time;
|
||||
foreach ($order as $key => $qid) {
|
||||
$results["$a->user"]["$qid"]["answer1"] = "";
|
||||
$results["$a->user"]["$qid"]["answer2"] = "";
|
||||
$results["$a->userid"]["$qid"]["answer1"] = "";
|
||||
$results["$a->userid"]["$qid"]["answer2"] = "";
|
||||
}
|
||||
}
|
||||
$results["$a->user"]["$a->question"]["answer1"] = $a->answer1;
|
||||
$results["$a->user"]["$a->question"]["answer2"] = $a->answer2;
|
||||
$results["$a->userid"]["$a->question"]["answer1"] = $a->answer1;
|
||||
$results["$a->userid"]["$a->question"]["answer2"] = $a->answer2;
|
||||
}
|
||||
|
||||
|
||||
|
@ -136,7 +136,7 @@
|
|||
if (! $u = get_record("user", "id", $user)) {
|
||||
error("Error finding student # $user");
|
||||
}
|
||||
if ($n = get_record("survey_analysis", "survey", $survey->id, "user", $user)) {
|
||||
if ($n = get_record("survey_analysis", "survey", $survey->id, "userid", $user)) {
|
||||
$notes = $n->notes;
|
||||
} else {
|
||||
$notes = "No notes made";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue