diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-02 13:19:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-02 13:19:40 +0000 |
| commit | 7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3 (patch) | |
| tree | b2bbf1e855f1c185f76972777cef56b29e5e10d2 /phpBB/includes/mcp/mcp_topic.php | |
| parent | de1c536548c5b41d33a16f3afe12ba67000d7210 (diff) | |
| download | forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.gz forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.bz2 forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.xz forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.zip | |
- a bunch of fixes
- added todos to the updater to make sure i do not forget. :)
git-svn-id: file:///svn/phpbb/trunk@6698 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_topic.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index ae4ed9850c..44904358e5 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -79,7 +79,7 @@ function mcp_topic_view($id, $mode, $action) $posts_per_page = $total; } - $sql = 'SELECT u.username, u.user_colour, p.* + $sql = 'SELECT u.username, u.username_clean, u.user_colour, p.* FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u WHERE ' . (($action == 'reports') ? 'p.post_reported = 1 AND ' : '') . ' p.topic_id = ' . $topic_id . ' ' . @@ -467,6 +467,7 @@ function merge_posts($topic_id, $to_topic_id) if (sizeof($topic_data)) { + $topic_data = $topic_data[$topic_id]; $return_link .= sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_data['forum_id'] . '&t=' . $topic_id) . '">', '</a>'); } |