Merge branch 'wip-MDL-41307-master' of git://github.com/abgreeve/moodle

This commit is contained in:
Damyon Wiese 2013-08-27 13:36:38 +08:00
commit f5a791ee7a
2 changed files with 4 additions and 2 deletions

View file

@ -225,9 +225,10 @@ if ($where) {
$where = 'WHERE '. $where;
}
$allusernames = get_all_user_name_fields(true, 'u');
$query = "
SELECT tg.id, tg.name, tg.rawname, tg.tagtype, tg.flag, tg.timemodified,
u.id AS owner, u.firstname, u.lastname,
u.id AS owner, $allusernames,
COUNT(ti.id) AS count
FROM {tag} tg
LEFT JOIN {tag_instance} ti ON ti.tagid = tg.id