glossary MDL-22970 changed fieldname so that MSSQL does not complain about same field...

something should be done about this in the driver

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index f124df9..cb96fac 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -353,7 +353,7 @@ function glossary_print_recent_activity($course, $viewfullnames, $timestart) {
     }
 
     $selectsql = 'SELECT ge.id, ge.concept, ge.approved, ge.timemodified, ge.glossaryid,
-                                        ge.userid, '.user_picture::fields('u',null,'userid');
+                                        ge.userid, '.user_picture::fields('u',null,'uid');
     $countsql = 'SELECT COUNT(*)';
 
     $joins = array(' FROM {glossary_entries} ge ');