diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-29 12:10:02 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-29 12:10:02 +0100 |
| commit | 7f6aff1d097ae674054233b66ce037df547c516e (patch) | |
| tree | 1545c8501cc77a4739424c7618609872246272f5 /phpBB | |
| parent | fd16a50baf8fe18b646a31a4e46278b589912ed9 (diff) | |
| parent | 2e7f66b16ccfe4e3a84ed5bfa0c87013c30241b2 (diff) | |
| download | forums-7f6aff1d097ae674054233b66ce037df547c516e.tar forums-7f6aff1d097ae674054233b66ce037df547c516e.tar.gz forums-7f6aff1d097ae674054233b66ce037df547c516e.tar.bz2 forums-7f6aff1d097ae674054233b66ce037df547c516e.tar.xz forums-7f6aff1d097ae674054233b66ce037df547c516e.zip | |
Merge branch 'ticket/lucifer4o/12276' into develop-ascraeus
* ticket/lucifer4o/12276:
[ticket/12276] Expand core.memberlist_view_profile
[ticket/12276] Expand core.memberlist_view_profile
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/memberlist.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index df47fd2f4b..07c7ceaa13 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -596,9 +596,12 @@ switch ($mode) * enabled? * @var bool foes_enabled Is the ucp foes module * enabled? + * @var bool friend Is the user friend? + * @var bool foe Is the user foe? * @since 3.1-A1 + * @changed 3.1.0-b2 Added friend and foe status */ - $vars = array('member', 'user_notes_enabled', 'warn_user_enabled', 'zebra_enabled', 'friends_enabled', 'foes_enabled'); + $vars = array('member', 'user_notes_enabled', 'warn_user_enabled', 'zebra_enabled', 'friends_enabled', 'foes_enabled', 'friend', 'foe'); extract($phpbb_dispatcher->trigger_event('core.memberlist_view_profile', compact($vars))); $template->assign_vars(show_profile($member, $user_notes_enabled, $warn_user_enabled)); |