From 37695a6ff65ce7b51e0a5562e40d84f061f32efb Mon Sep 17 00:00:00 2001
From: Aparup Banerjee <aparup@moodle.com>
Date: Wed, 16 Feb 2011 04:46:20 +0100
Subject: [PATCH] glossary MDL-22970 uid is reserved in ORACLE! changed to
 userid

---
 mod/glossary/lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index cb96facb479..b79d4a63666 100644
--- 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,'uid');
+                                        '.user_picture::fields('u',null,'userid');
     $countsql = 'SELECT COUNT(*)';
 
     $joins = array(' FROM {glossary_entries} ge ');