mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-21 16:10:38 +01:00
Code Issues Releases Wiki Activity

[ticket/16237] fix merge conflicts

Browse Source 
PHPBB3-16237
This commit is contained in:
hanakin 2020-05-08 11:25:50 -10:00
parent a1b88e12ca
commit f7dfff7cf0
2 changed files with 2 additions and 2 deletions
phpBB/styles/prosilver/template
mcp_post.htmlsearch_results.html

2
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 %}

2
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>