Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12276] Expand core.memberlist_view_profile
  [ticket/12276] Expand core.memberlist_view_profile
This commit is contained in:
Joas Schilling 2014-03-29 12:10:49 +01:00
commit 4e60f7e0fa

View file

@ -596,9 +596,12 @@ switch ($mode)
* enabled? * enabled?
* @var bool foes_enabled Is the ucp foes module * @var bool foes_enabled Is the ucp foes module
* enabled? * enabled?
* @var bool friend Is the user friend?
* @var bool foe Is the user foe?
* @since 3.1-A1 * @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))); extract($phpbb_dispatcher->trigger_event('core.memberlist_view_profile', compact($vars)));
$template->assign_vars(show_profile($member, $user_notes_enabled, $warn_user_enabled)); $template->assign_vars(show_profile($member, $user_notes_enabled, $warn_user_enabled));