From f7dfff7cf058ebb503d7a16556396429fe40e350 Mon Sep 17 00:00:00 2001
From: hanakin <midaym@gmail.com>
Date: Fri, 8 May 2020 11:25:50 -1000
Subject: [PATCH] [ticket/16237] fix merge conflicts

PHPBB3-16237
---
 phpBB/styles/prosilver/template/mcp_post.html       | 2 +-
 phpBB/styles/prosilver/template/search_results.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index e377f74bca..4710eef7b7 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -105,7 +105,7 @@
 		{% if S_POST_REPORTED and not S_MCP_REPORT %}
 			<p class="post-notice reported">
 				{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
-				<a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a>
+				<a href="{U_MCP_REPORT}"><strong>{{{ lang('POST_REPORTED') }}</strong></a>
 			</p>
 		{% endif %}
 
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index b0cc2aa5d3..69b3dd2ca4 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -134,7 +134,7 @@
 								<!-- IF searchresults.S_HAS_POLL -->{{ Icon('iconify', 'fa:bar-chart', '', true) }}<!-- ENDIF -->
 								<!-- IF searchresults.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }}<!-- ENDIF -->
 								{% EVENT topiclist_row_topic_by_author_before %}
-								{L_POST_BY_AUTHOR} <!-- EVENT search_results_topic_author_username_prepend -->{searchresults.TOPIC_AUTHOR_FULL}<!-- EVENT search_results_topic_author_username_append --> &raquo; {searchresults.FIRST_POST_TIME} &raquo; {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>
+								{L_POST_BY_AUTHOR} <!-- EVENT search_results_topic_author_username_prepend -->{searchresults.TOPIC_AUTHOR_FULL}<!-- EVENT search_results_topic_author_username_append --> <time datetime="{searchresults.FIRST_POST_TIME_RFC3339}">{searchresults.FIRST_POST_TIME}</time> &raquo; {searchresults.FIRST_POST_TIME} &raquo; {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>
 								{% EVENT topiclist_row_topic_by_author_after %}
 							</div>