diff options
author | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:57:18 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:57:18 +0200 |
commit | 34fb146ab5c5e5c52541a5c8191043a94bfa0cd1 (patch) | |
tree | f128434b5609c409deb4c3122dfde729f5526c0a /phpBB/memberlist.php | |
parent | 4177edf33a010b20c32e908e307ae0729d880af1 (diff) | |
parent | 05a8baffdbb8bcca05ab927b11f687de99ac7ea9 (diff) | |
download | forums-34fb146ab5c5e5c52541a5c8191043a94bfa0cd1.tar forums-34fb146ab5c5e5c52541a5c8191043a94bfa0cd1.tar.gz forums-34fb146ab5c5e5c52541a5c8191043a94bfa0cd1.tar.bz2 forums-34fb146ab5c5e5c52541a5c8191043a94bfa0cd1.tar.xz forums-34fb146ab5c5e5c52541a5c8191043a94bfa0cd1.zip |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/memberlist.php')
-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 e816e06488..b4bf92836f 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -105,7 +105,10 @@ switch ($mode) { case 'team': // Display a listing of board admins, moderators - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('user_get_id_name')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } $page_title = $user->lang['THE_TEAM']; $template_html = 'memberlist_team.html'; |