diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-28 16:21:17 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-28 16:21:17 +0000 |
| commit | d6ef968a679f97e60d62bfae7ac2856cb8334591 (patch) | |
| tree | 9095cb5a225ef2f92050d05212cfa138f247bee4 /phpBB/includes | |
| parent | 69ef685cde40bb014e8e5a3872baa77136bdd7fb (diff) | |
| download | forums-d6ef968a679f97e60d62bfae7ac2856cb8334591.tar forums-d6ef968a679f97e60d62bfae7ac2856cb8334591.tar.gz forums-d6ef968a679f97e60d62bfae7ac2856cb8334591.tar.bz2 forums-d6ef968a679f97e60d62bfae7ac2856cb8334591.tar.xz forums-d6ef968a679f97e60d62bfae7ac2856cb8334591.zip | |
- made sure ranks are displayed correctly (used RANK instead of RANK_TITLE)
- #6630
- hide a few links from bots (forum/topic marking, memberlist, post/reply/quote/edit/etc. buttons) [#6354]
- #5698
git-svn-id: file:///svn/phpbb/trunk@6818 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 41b40f76e3..fe78a6252b 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -390,6 +390,11 @@ class acp_forums { $forum_data = $row; } + else + { + $forum_data['left_id'] = $row['left_id']; + $forum_data['right_id'] = $row['right_id']; + } // Make sure there is no forum displayed for parents_list having the current forum id as a parent... $sql = 'SELECT forum_id diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index e36d3571f6..ee15ad116c 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1705,7 +1705,6 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow { $user_ary[] = $row['user_id']; } - $db->sql_freeresult($result); if (sizeof($user_ary)) diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 60591f2031..af476aabe7 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -164,8 +164,8 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'MESSAGE_AUTHOR' => get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), 'U_MESSAGE_AUTHOR' => get_username_string('profile', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), - 'AUTHOR_RANK' => $user_info['rank_title'], - 'RANK_IMAGE' => $user_info['rank_image'], + 'RANK_TITLE' => $user_info['rank_title'], + 'RANK_IMG' => $user_info['rank_image'], 'AUTHOR_AVATAR' => (isset($user_info['avatar'])) ? $user_info['avatar'] : '', 'AUTHOR_JOINED' => $user->format_date($user_info['user_regdate']), 'AUTHOR_POSTS' => (!empty($user_info['user_posts'])) ? $user_info['user_posts'] : '', |