diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-06 11:01:53 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-06 11:01:53 +0100 |
| commit | 2edf94741562c7a5e0befe91173f6ccfdbaab1fc (patch) | |
| tree | 6e88f5ee8c90c90c2c305bb4a9fa814d7f986827 | |
| parent | d9109355a36ec27d46c7eadba0a14d1aac4c5b82 (diff) | |
| parent | 64d880a15c3f016d07fc188c5cccba814ffe460f (diff) | |
| download | forums-2edf94741562c7a5e0befe91173f6ccfdbaab1fc.tar forums-2edf94741562c7a5e0befe91173f6ccfdbaab1fc.tar.gz forums-2edf94741562c7a5e0befe91173f6ccfdbaab1fc.tar.bz2 forums-2edf94741562c7a5e0befe91173f6ccfdbaab1fc.tar.xz forums-2edf94741562c7a5e0befe91173f6ccfdbaab1fc.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/memberlist.php | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 5a5be6f761..e64dab635b 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -173,6 +173,22 @@ switch ($mode) 'ORDER_BY' => 'u.username_clean ASC', ); + /** + * Modify the query used to get the users for the team page + * + * @event core.memberlist_team_modify_query + * @var array sql_ary Array containing the query + * @var array group_ids Array of group ids + * @var array teampage_data The teampage data + * @since 3.1.3-RC1 + */ + $vars = array( + 'sql_ary', + 'group_ids', + 'teampage_data', + ); + extract($phpbb_dispatcher->trigger_event('core.memberlist_team_modify_query', compact($vars))); + $result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary)); $user_ary = $user_ids = $group_users = array(); @@ -285,7 +301,7 @@ switch ($mode) $user_rank_data = phpbb_get_user_rank($row, (($row['user_id'] == ANONYMOUS) ? false : $row['user_posts'])); - $template->assign_block_vars('group.user', array( + $template_vars = array( 'USER_ID' => $row['user_id'], 'FORUMS' => $row['forums'], 'FORUM_OPTIONS' => (isset($row['forums_options'])) ? true : false, @@ -304,7 +320,25 @@ switch ($mode) 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), 'U_VIEW_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), - )); + ); + + /** + * Modify the template vars for displaying the user in the groups on the teampage + * + * @event core.memberlist_team_modify_template_vars + * @var array template_vars Array containing the query + * @var array row Array containing the action user row + * @var array groups_ary Array of groups with all users that should be displayed + * @since 3.1.3-RC1 + */ + $vars = array( + 'template_vars', + 'row', + 'groups_ary', + ); + extract($phpbb_dispatcher->trigger_event('core.memberlist_team_modify_template_vars', compact($vars))); + + $template->assign_block_vars('group.user', $template_vars); if ($config['teampage_memberships'] != 2) { |