diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-05 00:53:39 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-05 00:53:39 +0000 |
| commit | 6ca40653e93c5e544911b8c53348f9a7dd0b9771 (patch) | |
| tree | 34af43b768d73d78b7b804779b6e5ee752e68d1b /phpBB/viewtopic.php | |
| parent | d806c0a55ff7d829902cb9c09851a3e73d254bd1 (diff) | |
| download | forums-6ca40653e93c5e544911b8c53348f9a7dd0b9771.tar forums-6ca40653e93c5e544911b8c53348f9a7dd0b9771.tar.gz forums-6ca40653e93c5e544911b8c53348f9a7dd0b9771.tar.bz2 forums-6ca40653e93c5e544911b8c53348f9a7dd0b9771.tar.xz forums-6ca40653e93c5e544911b8c53348f9a7dd0b9771.zip | |
A few minor updates
git-svn-id: file:///svn/phpbb/trunk@4080 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 326ccca9d6..f9b25b6e8c 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -250,7 +250,7 @@ if ($topic_attachment) // Are we watching this topic? $s_watching_topic = $s_watching_topic_img = ''; -if ($config['email_enable']) +if ($config['email_enable'] && $config['allow_topic_notify']) { watch_topic_forum('topic', $s_watching_topic, $s_watching_topic_img, $user->data['user_id'], $topic_id, $notify_status); } @@ -617,7 +617,7 @@ $force_encoding = ''; $bbcode_bitfield = $i = 0; // Go ahead and pull all data for this topic -$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_karma, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_jabber, u.user_regdate, u.user_msnm, u.user_allow_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_sig_bbcode_bitfield, u.user_avatar, u.user_avatar_type, u.user_avatar_width, u.user_avatar_height, p.* +$sql = "SELECT u.username, u.user_id, u.user_colour, u.user_posts, u.user_from, u.user_karma, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_jabber, u.user_regdate, u.user_msnm, u.user_allow_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_sig_bbcode_bitfield, u.user_avatar, u.user_avatar_type, u.user_avatar_width, u.user_avatar_height, p.* FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u WHERE p.topic_id = $topic_id " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1') . " @@ -652,7 +652,7 @@ do $rowset[] = array( 'post_id' => $row['post_id'], 'post_time' => $row['post_time'], - 'poster' => $poster, + 'poster' => ($row['user_colour']) ? '<span style="color:#' . $row['user_colour'] . '">' . $poster . '</span>' : $poster, 'user_id' => $row['user_id'], 'topic_id' => $row['topic_id'], 'forum_id' => $row['forum_id'], @@ -893,8 +893,8 @@ foreach ($rowset as $key => $row) if (!empty($row['below_karma'])) { $template->assign_block_vars('postrow', array( - 'S_BELOW_MIN_KARMA' => true, - 'S_ROW_COUNT' => $i++, + 'S_IGNORE_POST' => true, + 'S_ROW_COUNT' => $i++, 'L_IGNORE_POST' => sprintf($user->lang['POST_BELOW_KARMA'], $row['poster'], intval($row['user_karma']), '<a href="viewtopic.' . $phpEx . $SID . '&p=' . $row['post_id'] . '&view=karma#' . $row['post_id'] . '">', '</a>')) ); @@ -910,10 +910,10 @@ foreach ($rowset as $key => $row) else { $template->assign_block_vars('postrow', array( - 'S_WRONG_ENCODING' => true, - 'S_ROW_COUNT' => $i++, + 'S_IGNORE_POST' => true, + 'S_ROW_COUNT' => $i++, - 'L_IGNORE_POST' => sprintf($user->lang['POST_ENCODING'], $row['poster'], '<a href="viewtopic.' . $phpEx . $SID . '&p=' . $row['post_id'] . '&view=encoding#' . $row['post_id'] . '">', '</a>')) + 'L_IGNORE_POST' => sprintf($user->lang['POST_ENCODING'], $row['poster'], '<a href="viewtopic.' . $phpEx . $SID . '&p=' . $row['post_id'] . '&view=encoding#' . $row['post_id'] . '">', '</a>')) ); continue; |