In function forum_get_recent_posts, removed u.id from select because of conflict...

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index c7f77de23ecf7c28ce72d391f996491287785a99..e0058bf6f692ecfeecb87c5e876527721aa74bb5 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -969,14 +969,14 @@ function forum_get_recent_posts($sincetime, $forum="0") {
         $forumselect = "";
     }
 
-    return get_records_sql("SELECT p.*, d.name, u.id, u.firstname, u.lastname, u.picture, d.course
+    return get_records_sql("SELECT p.*, d.name, u.firstname, u.lastname, u.picture, d.course
                               FROM {$CFG->prefix}forum_posts p, 
                                    {$CFG->prefix}forum_discussions d,
                                    {$CFG->prefix}user u
                              WHERE p.modified > '$sincetime' $forumselect
                                AND p.userid = u.id
                                AND p.discussion = d.id
-                             ORDER BY p.discussion ASC");
+                             ORDER BY p.modified ASC");
 }