rating MDL-21657 added aliasing and unaliasing of the fields returned by user_picture...

diff --git a/rating/index.php b/rating/index.php
index f9b88c7..412ae8c 100644 (file)
--- a/rating/index.php
+++ b/rating/index.php
@@ -78,7 +78,13 @@ if (!$ratings) {
     echo "<th class=\"header\" scope=\"col\" style=\"width:100%\"><a href=\"report.php?id=$itemid&amp;sort=rating\">$strrating</a></th>";
     echo "<th class=\"header\" scope=\"col\"><a href=\"report.php?id=$itemid&amp;sort=time\">$strtime</a></th>";
     echo "</tr>";
+    $user = null;
     foreach ($ratings as $rating) {
+        //undo the aliasing necessary for user_picture::fields
+        $user = clone($rating);//could get away with just overwriting rating->id and not cloning
+        //the rating object as we don't use rating->id again. That just seems like a bad idea.
+        $user->id = $user->uid;
+        
         echo '<tr class="ratingitemheader">';
         echo "<td>";
         if($course && $course->id) {

diff --git a/rating/lib.php b/rating/lib.php
index ac368ec..e405ae7 100644 (file)
--- a/rating/lib.php
+++ b/rating/lib.php
@@ -183,7 +183,7 @@ class rating implements renderable {
     public static function load_ratings_for_item($context, $itemid, $sort) {
         global $DB;
 
-        $userfields = user_picture::fields('u');
+        $userfields = user_picture::fields('u','uid');
         $sql = "SELECT r.id, r.rating, r.itemid, r.userid, r.timemodified,
                     $userfields
                 FROM {rating} r