removed all ASes from table aliases in question / quiz code - MDL-10344

diff --git a/mod/quiz/backuplib.php b/mod/quiz/backuplib.php
index bcb6cfff5b581b69807606c671f955e24cb14a74..2eeda2f29b7e7b9ddbf549b10b2fbfe7a25666d2 100644 (file)
--- a/mod/quiz/backuplib.php
+++ b/mod/quiz/backuplib.php
@@ -51,9 +51,9 @@
         // then, all categories from this course's modules' contexts.
         // using 'dummykeyname' in sql because otherwise get_records_sql_menu returns an error
         // if two key names are the same.
-        $cmcontexts = get_records_sql_menu("SELECT c.id, c.id AS dummykeyname FROM `{$CFG->prefix}modules` AS `mod`,
-                                                        `{$CFG->prefix}course_modules` AS `cm`,
-                                                        `{$CFG->prefix}context` as `c`
+        $cmcontexts = get_records_sql_menu("SELECT c.id, c.id AS dummykeyname FROM `{$CFG->prefix}modules` `mod`,
+                                                        `{$CFG->prefix}course_modules` `cm`,
+                                                        `{$CFG->prefix}context` `c`
                                WHERE mod.name = 'quiz' AND mod.id = cm.module AND cm.id = c.instanceid
                                     AND c.contextlevel = ".CONTEXT_MODULE." AND cm.course = $course");
         if ($cmcontexts){
@@ -67,7 +67,7 @@
         $status = $status && execute_sql("INSERT INTO {$CFG->prefix}backup_ids
                                        (backup_code, table_name, old_id, info)
                                        SELECT '$backup_unique_code', 'question', q.id, ''
-                                       FROM {$CFG->prefix}question AS q, {$CFG->prefix}backup_ids AS bk
+                                       FROM {$CFG->prefix}question q, {$CFG->prefix}backup_ids bk
                                        WHERE q.category = bk.old_id AND bk.table_name = 'question_categories' AND
                                         bk.backup_code = '$backup_unique_code'", false);
 
@@ -85,7 +85,7 @@
             $questionselectsqlwhere = "AND quiz.course = '$course'
                          AND qqi.quiz = quiz.id";
         }
-        $categoriesinothercourses = get_records_sql("
+        $categories = get_records_sql("
                 SELECT id, parent, 0 AS childrendone
                 FROM {$CFG->prefix}question_categories
                 WHERE contextid IN (".join($parentcontexts, ', ').")

diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 7e29ddf1fc3e1d26acba85c5647d4159e3acbbc2..b391926be0b4ca1099b538e54a436c06b0a54574 100644 (file)
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -389,7 +389,7 @@ class quiz_report extends quiz_default_report {
         if ($hasfeedback) {
             $factor = $quiz->grade/$quiz->sumgrades;
             $select .= ', qf.feedbacktext ';
-            $from .= " JOIN {$CFG->prefix}quiz_feedback AS qf ON " .
+            $from .= " JOIN {$CFG->prefix}quiz_feedback qf ON " .
                     "qf.quizid = $quiz->id AND qf.mingrade <= qa.sumgrades * $factor AND qa.sumgrades * $factor < qf.maxgrade";
         }