diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-02 16:35:48 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-02 16:35:48 +0000 |
| commit | 46c9da77a47abba5f0bb314d9a4cd68d1abb32c9 (patch) | |
| tree | 33183de1bf76a073820ffeafc5d9931381ba125d /phpBB/memberlist.php | |
| parent | 1c32dcaeb10292de8fa8de25c8775fbdab25e2c7 (diff) | |
| download | forums-46c9da77a47abba5f0bb314d9a4cd68d1abb32c9.tar forums-46c9da77a47abba5f0bb314d9a4cd68d1abb32c9.tar.gz forums-46c9da77a47abba5f0bb314d9a4cd68d1abb32c9.tar.bz2 forums-46c9da77a47abba5f0bb314d9a4cd68d1abb32c9.tar.xz forums-46c9da77a47abba5f0bb314d9a4cd68d1abb32c9.zip | |
- do not allow setting the parent to currently assigned childs [Bug #6708]
- Allow the display_on_index setting to be specified for link forums [Bug #6660]
- Rank code in functions_display.php [Bug #6656]
- Added some new locations for the viewonline page [Related to bug #6484]
- Do not display attached images inline if user disabled image display in posts; the same with flash files [Bug #6226]
git-svn-id: file:///svn/phpbb/trunk@6829 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index ff1ccd6670..1811376b5b 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -15,6 +15,7 @@ define('IN_PHPBB', true); $phpbb_root_path = './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); +include($phpbb_root_path . 'includes/functions_display.' . $phpEx); // Start session management $user->session_begin(); @@ -418,10 +419,6 @@ switch ($mode) if ($config['load_user_activity']) { - if (!function_exists('display_user_activity')) - { - include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx); - } display_user_activity($member); } @@ -1346,37 +1343,6 @@ make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); page_footer(); /** -* Get user rank title and image -*/ -function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src) -{ - global $ranks, $config; - - if (!empty($user_rank)) - { - $rank_title = (isset($ranks['special'][$user_rank]['rank_title'])) ? $ranks['special'][$user_rank]['rank_title'] : ''; - $rank_img = (!empty($ranks['special'][$user_rank]['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] . '" alt="' . $ranks['special'][$user_rank]['rank_title'] . '" title="' . $ranks['special'][$user_rank]['rank_title'] . '" />' : ''; - $rank_img_src = (!empty($ranks['special'][$user_rank]['rank_image'])) ? $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] : ''; - } - else - { - if (isset($ranks['normal'])) - { - foreach ($ranks['normal'] as $rank) - { - if ($user_posts >= $rank['rank_min']) - { - $rank_title = $rank['rank_title']; - $rank_img = (!empty($rank['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $rank['rank_image'] . '" alt="' . $rank['rank_title'] . '" title="' . $rank['rank_title'] . '" />' : ''; - $rank_img_src = (!empty($rank['rank_image'])) ? $config['ranks_path'] . '/' . $rank['rank_image'] : ''; - break; - } - } - } - } -} - -/** * Prepare profile data */ function show_profile($data) |