MDL-11472 fixed harcoded mdl_ prefix in sql queries

diff --git a/course/report/log/lib.php b/course/report/log/lib.php
index 942eca7e45bab4003a7f36627906f3cc7ad8583f..4e058dc0fb43eb6024926fd1fee57ed4fdfb85d5 100644 (file)
--- a/course/report/log/lib.php
+++ b/course/report/log/lib.php
@@ -111,7 +111,7 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
             }
         } else {
             if (has_capability('moodle/site:viewreports', $sitecontext) && $showcourses) {
-                $sql = "select distinct course, coursename from mdl_mnet_log where hostid = '$hostid'";
+                $sql = "select distinct course, coursename from {$CFG->prefix}mnet_log where hostid = '$hostid'";
                 if ($ccc = get_records_sql($sql)) {
                     foreach ($ccc as $cc) {
                         if (1 == $cc->course) { // TODO: this might be wrong - site course may have another id

diff --git a/lib/grade/grade_outcome.php b/lib/grade/grade_outcome.php
index 9db91adcd0158621e0d214c1f0dd76bb7db080f8..e7e4912d94ed48ccf4ea88ae9de54614b24bcd48 100644 (file)
--- a/lib/grade/grade_outcome.php
+++ b/lib/grade/grade_outcome.php
@@ -288,6 +288,8 @@ class grade_outcome extends grade_object {
      * @return float
      */
     function get_grade_info($courseid=null, $average=true, $items=false) {
+        global $CFG;
+
         if (!isset($this->id)) {
             debugging("You must setup the outcome's id before calling its get_grade_info() method!");
             return false; // id must be defined for this to work
@@ -300,19 +302,19 @@ class grade_outcome extends grade_object {
 
         $wheresql = '';
         if (!is_null($courseid)) {
-            $wheresql = " AND mdl_grade_items.courseid = $courseid ";
+            $wheresql = " AND {$CFG->prefix}grade_items.courseid = $courseid ";
         }
 
         $selectadd = '';
         if ($items !== false) {
-            $selectadd = ', mdl_grade_items.* ';
+            $selectadd = ", {$CFG->prefix}grade_items.* ";
         }
 
         $sql = "SELECT finalgrade $selectadd
-                  FROM mdl_grade_grades, mdl_grade_items, mdl_grade_outcomes
-                 WHERE mdl_grade_outcomes.id = mdl_grade_items.outcomeid
-                   AND mdl_grade_items.id = mdl_grade_grades.itemid
-                   AND mdl_grade_outcomes.id = $this->id
+                  FROM {$CFG->prefix}grade_grades, {$CFG->prefix}grade_items, {$CFG->prefix}grade_outcomes
+                 WHERE {$CFG->prefix}grade_outcomes.id = {$CFG->prefix}grade_items.outcomeid
+                   AND {$CFG->prefix}grade_items.id = {$CFG->prefix}grade_grades.itemid
+                   AND {$CFG->prefix}grade_outcomes.id = $this->id
                    $wheresql";
 
         $grades = get_records_sql($sql);

diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 9141be053c49202bea0ab1bef512dbfa9d3c3c43..cf3491d2ec5825935b3070d387085523c7aeb47c 100644 (file)
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -555,8 +555,8 @@ function wiki_get_other_wikis(&$wiki, &$user, &$course, $currentid=0) {
         $wiki_entries = wiki_get_entries($wiki, 'student');
         
         if (!empty($CFG->enablegroupings) && !empty($wiki->groupingid)) {
-            $sql = "SELECT gm.userid FROM mdl_groups_members gm " .
-                    "INNER JOIN mdl_groupings_groups gg ON gm.groupid = gg.groupid " .
+            $sql = "SELECT gm.userid FROM {$CFG->prefix}groups_members gm " .
+                    "INNER JOIN {$CFG->prefix}groupings_groups gg ON gm.groupid = gg.groupid " .
                     "WHERE gg.groupingid = $wiki->groupingid ";
     
             $groupingmembers = get_records_sql($sql);