Merge branch 'MDL-30043' of git://github.com/mouneyrac/moodle

This commit is contained in:
Eloy Lafuente (stronk7)
2011-11-10 01:49:56 +01:00
+2 -2
View File
@@ -97,9 +97,9 @@ if (!empty($user)) {
// It does not really matter we take the first one that is valid.
$tokenssql = "SELECT t.id, t.sid, t.token, t.validuntil, t.iprestriction
FROM {external_tokens} t
WHERE t.userid = ? AND t.externalserviceid = ?
WHERE t.userid = ? AND t.externalserviceid = ? AND t.tokentype = ?
ORDER BY t.timecreated ASC";
$tokens = $DB->get_records_sql($tokenssql, array($user->id, $service->id));
$tokens = $DB->get_records_sql($tokenssql, array($user->id, $service->id, EXTERNAL_TOKEN_PERMANENT));
//A bit of sanity checks
foreach ($tokens as $key=>$token) {