aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_posting.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-17 19:40:21 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-17 19:40:21 +0000
commitac5a12c0244f22532ab992ecd0d94441691b5c89 (patch)
treed12a6791a47e4fbaaad522fbe4df5e2a824adb12 /phpBB/includes/functions_posting.php
parentd9387842ac7c41d4c92ccf7d797fed214ed38de8 (diff)
downloadforums-ac5a12c0244f22532ab992ecd0d94441691b5c89.tar
forums-ac5a12c0244f22532ab992ecd0d94441691b5c89.tar.gz
forums-ac5a12c0244f22532ab992ecd0d94441691b5c89.tar.bz2
forums-ac5a12c0244f22532ab992ecd0d94441691b5c89.tar.xz
forums-ac5a12c0244f22532ab992ecd0d94441691b5c89.zip
fix colour assignment. ;)
git-svn-id: file:///svn/phpbb/trunk@6596 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-rw-r--r--phpBB/includes/functions_posting.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 407351a78d..78900e2bf4 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -857,7 +857,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
global $config, $phpbb_root_path, $phpEx;
// Go ahead and pull all data for this topic
- $sql = 'SELECT u.username, u.user_id, p.*
+ $sql = 'SELECT u.username, u.user_id, u.user_colour, p.*
FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
WHERE p.topic_id = $topic_id
AND p.poster_id = u.user_id
@@ -929,7 +929,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
'U_POST_ID' => $row['post_id'],
'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'],
'U_MCP_DETAILS' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&amp;mode=post_details&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, $user->session_id) : '',
- 'POSTER_QUOTE' => ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? addslashes($poster) : '')
+ 'POSTER_QUOTE' => ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '')
);
unset($rowset[$i]);
}