aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/functions_display.php2
-rw-r--r--phpBB/styles/subSilver/template/posting_body.html2
2 files changed, 3 insertions, 1 deletions
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>