From c32a1b12789c40967e4958bed41e6a4f7d8ace92 Mon Sep 17 00:00:00 2001
From: hanakin <midaym@gmail.com>
Date: Sun, 3 May 2020 22:52:22 -1000
Subject: [PATCH] [ticket/16237] fix several issues

PHPBB3-16237
---
 phpBB/styles/prosilver/template/forumlist_body.html       | 2 +-
 phpBB/styles/prosilver/template/search_results.html       | 2 ++
 phpBB/styles/prosilver/template/ucp_pm_viewmessage.html   | 2 +-
 phpBB/styles/prosilver/template/viewtopic_body.html       | 8 ++++----
 .../styles/prosilver/template/viewtopic_topic_tools.html  | 8 ++++----
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 44ad4ff2d2..ecfee407f3 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -101,7 +101,7 @@
 								</a>
 							<!-- ELSEIF forumrow.U_UNAPPROVED_POSTS -->
 								<a href="{forumrow.U_UNAPPROVED_POSTS}" title="{L_POSTS_UNAPPROVED_FORUM}">
-									{{ Icon('iconify', 'mdi:alert-decagram', lang('TOPICS_UNAPPROVED'), true, 'c-unapproved-icon') }}
+									{{ Icon('iconify', 'mdi:alert-decagram', lang('POSTS_UNAPPROVED_FORUM'), true, 'c-unapproved-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<!-- IF forumrow.LAST_POST_TIME -->
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index f526f0c33a..fc55e674d9 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -133,7 +133,9 @@
 							<div class="responsive-hide left-box">
 								<!-- 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>
+								{% EVENT topiclist_row_topic_by_author_after %}
 							</div>
 
 							<!-- IF .searchresults.pagination -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 307471abab..5248972701 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -32,7 +32,7 @@
 					<!-- IF AUTHOR_AVATAR --><a href="{U_MESSAGE_AUTHOR}" class="avatar">{AUTHOR_AVATAR}</a><!-- ENDIF -->
 					<!-- EVENT ucp_pm_viewmessage_avatar_after -->
 				</div>
-				{MESSAGE_AUTHOR_FULL}<!-- IF S_ONLINE -->  {{ Icon('iconify', 'fa:circle', lang('L_ONLINE'), true, 'c-online-icon') }}<!-- ENDIF -->
+				{MESSAGE_AUTHOR_FULL}<!-- IF S_ONLINE -->  {{ Icon('iconify', 'fa:circle', lang('ONLINE'), true, 'c-online-icon') }}<!-- ENDIF -->
 			</dt>
 
 			<!-- EVENT ucp_pm_viewmessage_rank_before -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 1c73b25e82..b026a093c2 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -149,7 +149,7 @@
 					<!-- EVENT viewtopic_body_avatar_after -->
 				</div>
 				<!-- EVENT viewtopic_body_post_author_before -->
-				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> {{ Icon('iconify', 'fa:circle', lang('L_ONLINE'), true, 'c-online-icon') }}<!-- ENDIF -->
+				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> {{ Icon('iconify', 'fa:circle', lang('ONLINE'), true, 'c-online-icon') }}<!-- ENDIF -->
 				<!-- EVENT viewtopic_body_post_author_after -->
 			</dt>
 
@@ -180,7 +180,7 @@
 				<strong>{L_CONTACT}{L_COLON}</strong>
 				<div class="dropdown-container dropdown-left">
 					<a href="#" class="dropdown-trigger" title="{postrow.CONTACT_USER}">
-						{{ Icon('iconify', 'mdi:comment-processing-outline', '', true) }}<span class="sr-only">{postrow.CONTACT_USER}</span>
+						{{ Icon('iconify', 'mdi:comment-processing-outline', postrow.CONTACT_USER, true) }}
 					</a>
 					<div class="dropdown">
 						<div class="pointer"><div class="pointer-inner"></div></div>
@@ -280,9 +280,9 @@
 			<!-- EVENT viewtopic_body_postrow_post_details_before -->
 			<p class="author">
 				{% if postrow.S_UNREAD_POST %}
-					<span title="{postrow.MINI_POST}">{{ Icon('iconify', 'fa:file', postrow.MINI_POST, true, 'c-topic-unread-icon') }}</span>
+					<span>{{ Icon('iconify', 'fa:file', postrow.MINI_POST, true, 'c-topic-unread-icon') }}</span>
 				{% else %}
-					<span title="{postrow.MINI_POST}">{{ Icon('iconify', 'fa:file', postrow.MINI_POST, true, 'c-topic-icon') }}</span>
+					<span>{{ Icon('iconify', 'fa:file', postrow.MINI_POST, true, 'c-topic-icon') }}</span>
 				{% endif %}
 				<span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; </span><time datetime="{postrow.POST_DATE_RFC3339}">{postrow.POST_DATE}</time>
 			</p>
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index 37c3a37489..f1c2b73bae 100644
--- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -25,28 +25,28 @@
 				<!-- IF U_BOOKMARK_TOPIC -->
 					<li>
 						<a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link">
-							{{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true) }}<span>{S_BOOKMARK_TOPIC}</span>
+							{{ Icon('iconify', 'mdi:bookmark-plus-outline', S_BOOKMARK_TOPIC, false) }}
 						</a>
 					</li>
 				<!-- ENDIF -->
 				<!-- IF U_BUMP_TOPIC -->
 				<li>
 					<a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">
-						{{ Icon('iconify', 'mdi:update', '', true) }}<span>{L_BUMP_TOPIC}</span>
+						{{ Icon('iconify', 'mdi:update', lang('BUMP_TOPIC'), false) }}
 					</a>
 				</li>
 				<!-- ENDIF -->
 				<!-- IF U_EMAIL_TOPIC -->
 				<li>
 					<a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">
-						{{ Icon('iconify', 'mdi:send-circle-outline', '', true) }}<span>{L_EMAIL_TOPIC}</span>
+						{{ Icon('iconify', 'mdi:send-circle-outline', lang('EMAIL_TOPIC'), false) }}
 					</a>
 				</li>
 				<!-- ENDIF -->
 				<!-- IF U_PRINT_TOPIC -->
 				<li>
 					<a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p">
-						{{ Icon('iconify', 'ic:outline-print', '', true) }}<span>{L_PRINT_TOPIC}</span>
+						{{ Icon('iconify', 'ic:outline-print', lang('PRINT_TOPIC'), false) }}
 					</a>
 				</li>
 				<!-- ENDIF -->