From 7a5470161243b300b5377c22876126ecf3de8f6c Mon Sep 17 00:00:00 2001
From: kasimi <mail@kasimi.net>
Date: Sun, 21 Jul 2019 10:09:19 +0200
Subject: [PATCH 1/2] [ticket/16108] Add
 topiclist_row_topic_by_author_before|after

PHPBB3-16108
---
 phpBB/docs/events.md                           | 18 ++++++++++++++++++
 phpBB/styles/prosilver/template/mcp_forum.html |  2 ++
 .../prosilver/template/search_results.html     |  2 ++
 .../prosilver/template/viewforum_body.html     |  2 ++
 4 files changed, 24 insertions(+)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index c77691a048..d34ca5eee7 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -2281,6 +2281,24 @@ topiclist_row_prepend
 * Changed: 3.1.6-RC1 Added event to mcp_forum.html
 * Purpose: Add content into topic rows (inside the elements containing topic titles)
 
+topiclist_row_topic_by_author_after
+===
+* Locations:
+    + styles/prosilver/template/search_results.html
+    + styles/prosilver/template/viewforum_body.html
+    + styles/prosilver/template/mcp_forum.html
+* Since: 3.2.8-RC1
+* Purpose: Add content into topic rows (after the "by topic author" row)
+
+topiclist_row_topic_by_author_before
+===
+* Locations:
+    + styles/prosilver/template/search_results.html
+    + styles/prosilver/template/viewforum_body.html
+    + styles/prosilver/template/mcp_forum.html
+* Since: 3.2.8-RC1
+* Purpose: Add content into topic rows (before the "by topic author" row)
+
 topiclist_row_topic_title_after
 ===
 * Locations:
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index f6c518e1df..10ca102a15 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -86,7 +86,9 @@
 
 					<div class="responsive-hide">
 						<!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF -->
+						<!-- EVENT topiclist_row_topic_by_author_before -->
 						{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+						<!-- EVENT topiclist_row_topic_by_author_after -->
 					</div>
 					<!-- EVENT topiclist_row_append -->
 					</div>
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index d4dc6aa97e..d2156bf1f2 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -117,7 +117,9 @@
 							<div class="responsive-hide left-box">
 								<!-- IF searchresults.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i><!-- ENDIF -->
 								<!-- IF searchresults.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- 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/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index d7099f387f..c0232d14a9 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -198,7 +198,9 @@
 						<div class="topic-poster responsive-hide left-box">
 							<!-- IF topicrow.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i><!-- ENDIF -->
 							<!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF -->
+							<!-- EVENT topiclist_row_topic_by_author_before -->
 							{L_POST_BY_AUTHOR} <!-- EVENT viewforum_body_topic_author_username_prepend -->{topicrow.TOPIC_AUTHOR_FULL}<!-- EVENT viewforum_body_topic_author_username_append --> &raquo; {topicrow.FIRST_POST_TIME}
+							<!-- EVENT topiclist_row_topic_by_author_after -->
 							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> &raquo; {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
 						</div>
 

From 179f5c75edcdec0c3857b7f9520eb24413b0bc56 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 27 Jul 2019 16:04:48 +0200
Subject: [PATCH 2/2] [ticket/16108] Use twig syntax in template event

PHPBB3-16108
---
 phpBB/styles/prosilver/template/mcp_forum.html      | 4 ++--
 phpBB/styles/prosilver/template/search_results.html | 4 ++--
 phpBB/styles/prosilver/template/viewforum_body.html | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index 10ca102a15..82df5d5dbe 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -86,9 +86,9 @@
 
 					<div class="responsive-hide">
 						<!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF -->
-						<!-- EVENT topiclist_row_topic_by_author_before -->
+						{% EVENT topiclist_row_topic_by_author_before %}
 						{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
-						<!-- EVENT topiclist_row_topic_by_author_after -->
+						{% EVENT topiclist_row_topic_by_author_after %}
 					</div>
 					<!-- EVENT topiclist_row_append -->
 					</div>
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index d2156bf1f2..391afa4d7f 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -117,9 +117,9 @@
 							<div class="responsive-hide left-box">
 								<!-- IF searchresults.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i><!-- ENDIF -->
 								<!-- IF searchresults.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF -->
-								<!-- EVENT topiclist_row_topic_by_author_before -->
+								{% 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 -->
+								{% EVENT topiclist_row_topic_by_author_after %}
 							</div>
 
 							<!-- IF .searchresults.pagination -->
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index c0232d14a9..91410ec300 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -198,9 +198,9 @@
 						<div class="topic-poster responsive-hide left-box">
 							<!-- IF topicrow.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i><!-- ENDIF -->
 							<!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF -->
-							<!-- EVENT topiclist_row_topic_by_author_before -->
+							{% EVENT topiclist_row_topic_by_author_before %}
 							{L_POST_BY_AUTHOR} <!-- EVENT viewforum_body_topic_author_username_prepend -->{topicrow.TOPIC_AUTHOR_FULL}<!-- EVENT viewforum_body_topic_author_username_append --> &raquo; {topicrow.FIRST_POST_TIME}
-							<!-- EVENT topiclist_row_topic_by_author_after -->
+							{% EVENT topiclist_row_topic_by_author_after %}
 							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> &raquo; {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
 						</div>