From 07d7486389cc396a0867b80ebab105d864e46557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Dr=C3=B6scher?= <dhn2@users.sourceforge.net>
Date: Tue, 16 Jan 2007 23:46:37 +0000
Subject: [PATCH] #7110

git-svn-id: file:///svn/phpbb/trunk@6890 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_display.php              | 2 +-
 phpBB/styles/subSilver/template/posting_body.html | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index ab44baf944..73d52a5fdf 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -709,7 +709,7 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold
 
 	if ($topic_row['poll_start'])
 	{
-		$topic_type .= $user->lang['VIEW_TOPIC_POLL'];
+		$topic_type = $user->lang['VIEW_TOPIC_POLL'];
 	}
 }
 
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html
index 96920d90a7..7d871ae922 100644
--- a/phpBB/styles/subSilver/template/posting_body.html
+++ b/phpBB/styles/subSilver/template/posting_body.html
@@ -154,6 +154,7 @@
 		<!-- END to_recipient -->
 		</td>
 	</tr>
+	<!-- IF S_ALLOW_MASS_PM -->
 	<tr>
 		<td class="row1"><b class="genmed">{L_BCC}:</b></td>
 		<td class="row2">
@@ -165,6 +166,7 @@
 		<!-- END bcc_recipient -->
 		</td>
 	</tr>
+	<!-- ENDIF -->
 <!-- ENDIF -->
 
 <tr>