Merge branch 'MDL-26461_change_rating_scale' of git://github.com/andyjdavis/moodle

diff --git a/mod/quiz/overrides.php b/mod/quiz/overrides.php
index 0535793..5f5c6da 100644 (file)
--- a/mod/quiz/overrides.php
+++ b/mod/quiz/overrides.php
@@ -98,7 +98,7 @@ if ($groupmode) {
 }
 else {
     $colname = get_string('user');
-    $sql = 'SELECT o.*, u.firstname, u.lastname, u.id as uid
+    $sql = 'SELECT o.*, u.firstname, u.lastname
                 FROM {quiz_overrides} o JOIN {user} u
                 ON o.userid = u.id
                 WHERE o.quiz = ?

diff --git a/rating/index.php b/rating/index.php
index 8f4cf70..ff9b121 100644 (file)
--- a/rating/index.php
+++ b/rating/index.php
@@ -98,7 +98,7 @@ if (!$ratings) {
         //Undo the aliasing of the user id column from user_picture::fields()
         //we could clone the rating object or preserve the rating id if we needed it again
         //but we don't
-        $rating->id = $rating->uid;
+        $rating->id = $rating->userid;
 
         echo '<tr class="ratingitemheader">';
         echo "<td>";

diff --git a/rating/lib.php b/rating/lib.php
index b53abf2..29313e2 100644 (file)
--- a/rating/lib.php
+++ b/rating/lib.php
@@ -217,7 +217,7 @@ class rating_manager {
             $sortclause = "ORDER BY $options->sort";
         }
 
-        $userfields = user_picture::fields('u', null, 'uid');
+        $userfields = user_picture::fields('u', null, 'userid');
         $sql = "SELECT r.id, r.rating, r.itemid, r.userid, r.timemodified, $userfields
                 FROM {rating} r
                 LEFT JOIN {user} u ON r.userid = u.id

diff --git a/version.php b/version.php
index 6798667..db0c133 100644 (file)
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version = 2011021800.00;  // YYYYMMDD   = date of the last version bump
+$version = 2011022100.00;  // YYYYMMDD   = date of the last version bump
                         //         XX = daily increments
 
-$release = '2.0.1+ (Build: 20110218)';  // Human-friendly version name
+$release = '2.0.2 (Build: 20110221)';  // Human-friendly version name