From 1a887a5eef91e6b47c7053064802ddbb8ce6e186 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Thu, 14 Jan 2010 08:37:53 +0000 Subject: [PATCH] fixed pgsql compatibility issue caused by aliases with reserved words --- lib/adminlib.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/adminlib.php b/lib/adminlib.php index 216eed2c1e..e2525c4cc7 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -6490,13 +6490,10 @@ class admin_setting_managewebservicetokens extends admin_setting { //TODO: in order to let the administrator delete obsolete token, split this request in multiple request or use LEFT JOIN //here retrieve token list (including linked users firstname/lastname and linked services name) - $sql = "SELECT - token.id, token.token, user.firstname, user.lastname, service.name, token.validuntil - FROM - {external_tokens} token, {user} user, {external_services} service - WHERE - token.creatorid=? AND token.tokentype = ".EXTERNAL_TOKEN_PERMANENT." AND service.id = token.externalserviceid AND token.userid = user.id"; - $tokens = $DB->get_records_sql($sql, array( $USER->id)); + $sql = "SELECT t.id, t.token, u.firstname, u.lastname, s.name, t.validuntil + FROM {external_tokens} t, {user} u, {external_services} s + WHERE t.creatorid=? AND t.tokentype = ? AND s.id = t.externalserviceid AND t.userid = u.id"; + $tokens = $DB->get_records_sql($sql, array($USER->id, EXTERNAL_TOKEN_PERMANENT)); if (!empty($tokens)) { foreach ($tokens as $token) { //TODO: retrieve context -- 2.39.5