diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index fba0ec495e..dc45a8add0 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -229,13 +229,13 @@
- {postrow.L_POST_DELETED_MESSAGE}
- {postrow.L_POST_DISPLAY}
+ {postrow.L_POST_DELETED_MESSAGE}
+
{{ lang('POST_DISPLAY') }}
- {postrow.L_IGNORE_POST}
- {postrow.L_POST_DISPLAY}
+ {postrow.L_IGNORE_POST}
+
{{ lang('POST_DISPLAY') }}
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 3de6cbb498..f14cb5b6d8 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -2076,6 +2076,7 @@ for ($i = 0, $end = count($post_list); $i < $end; ++$i)
'U_MCP_APPROVE' => ($auth->acl_get('m_approve', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&p=' . $row['post_id']) : '',
'U_MCP_RESTORE' => ($auth->acl_get('m_approve', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_data['topic_visibility'] != ITEM_DELETED) ? 'deleted_posts' : 'deleted_topics') . '&p=' . $row['post_id']) : '',
'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'],
+ 'U_MINI_POST_VIEW' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '&view=show#p' . $row['post_id'],
'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '',
'U_PREV_POST_ID' => $prev_post_id,
'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id) : '',
@@ -2105,7 +2106,6 @@ for ($i = 0, $end = count($post_list); $i < $end; ++$i)
'S_IGNORE_POST' => ($row['foe']) ? true : false,
'L_IGNORE_POST' => ($row['foe']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '',
'S_POST_HIDDEN' => $row['hide_post'],
- 'L_POST_DISPLAY' => ($row['hide_post']) ? $user->lang('POST_DISPLAY', '
', '') : '',
'S_DELETE_PERMANENT' => $permanent_delete_allowed,
);
diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php
index e57b194571..b34b1ad2c2 100644
--- a/tests/functional/download_test.php
+++ b/tests/functional/download_test.php
@@ -115,7 +115,7 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
$this->assertContainsLang('POST_DELETED', $crawler->text());
$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Download Topic #1']}&sid={$this->sid}");
- $this->assertStringContainsString($this->lang('POST_DISPLAY', '', ''), $crawler->text());
+ $this->assertStringContainsString($this->lang('POST_DISPLAY'), $crawler->text());
}
public function test_download_softdeleted_post()
diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
index dcbc9166d7..fc0115a063 100644
--- a/tests/functional/feed_test.php
+++ b/tests/functional/feed_test.php
@@ -532,7 +532,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
self::assertContainsLang('POST_DELETED', $crawler->text());
$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1 - Topic #2']}&sid={$this->sid}");
- self::assertStringContainsString($this->lang('POST_DISPLAY', '', ''), $crawler->text());
+ self::assertStringContainsString($this->lang('POST_DISPLAY'), $crawler->text());
}
public function test_feeds_softdeleted_post_admin()
diff --git a/tests/functional/visibility_softdelete_test.php b/tests/functional/visibility_softdelete_test.php
index 4eba77ba1b..5128bb6005 100644
--- a/tests/functional/visibility_softdelete_test.php
+++ b/tests/functional/visibility_softdelete_test.php
@@ -177,7 +177,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
), 'after softdelete');
$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
- $this->assertStringContainsString($this->lang('POST_DISPLAY', '', ''), $crawler->text());
+ $this->assertStringContainsString($this->lang('POST_DISPLAY'), $crawler->text());
}
public function test_softdelete_post_no_m_delete()
@@ -227,7 +227,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
), 'after softdelete without m_delete');
$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
- $this->assertStringContainsString($this->lang('POST_DISPLAY', '', ''), $crawler->text());
+ $this->assertStringContainsString($this->lang('POST_DISPLAY'), $crawler->text());
}
public function test_move_softdeleted_post()