moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 00:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
blog/locallib.php
View file

@ -595,8 +595,9 @@ class blog_listing {
$userid = $USER->id; $userid = $USER->id;
} }
$allnamefields = get_all_user_name_fields(true, 'u');
// The query used to locate blog entries is complicated. It will be built from the following components: // The query used to locate blog entries is complicated. It will be built from the following components:
$requiredfields = "p.*, u.firstname, u.lastname, u.email"; // the SELECT clause $requiredfields = "p.*, $allnamefields, u.email"; // the SELECT clause
$tables = array('p' => 'post', 'u' => 'user'); // components of the FROM clause (table_id => table_name) $tables = array('p' => 'post', 'u' => 'user'); // components of the FROM clause (table_id => table_name)
$conditions = array('u.deleted = 0', 'p.userid = u.id', '(p.module = \'blog\' OR p.module = \'blog_external\')'); // components of the WHERE clause (conjunction) $conditions = array('u.deleted = 0', 'p.userid = u.id', '(p.module = \'blog\' OR p.module = \'blog_external\')'); // components of the WHERE clause (conjunction)

3
tag/manage.php
View file

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