From 59a84a71be236d3f5f05fa932f4f52984fb39037 Mon Sep 17 00:00:00 2001
From: battye <battye@phpbb.com>
Date: Wed, 13 Feb 2019 06:57:29 +0000
Subject: [PATCH 1/2] [ticket/15917] Special unapproved topics message

For forums that have no approved posts but also have
topics awaiting approval, to avoid the inconsistency
of saying 'no posts' alongside a positive post count.

PHPBB3-15917
---
 phpBB/language/en/common.php                        | 4 ++++
 phpBB/styles/prosilver/template/forumlist_body.html | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a037c5bfe8..835030762c 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -780,6 +780,10 @@ $lang = array_merge($lang, array(
 	'TOPIC_REVIEW'		=> 'Topic review',
 	'TOPIC_TITLE'		=> 'Topic title',
 	'TOPIC_UNAPPROVED'	=> 'This topic has not been approved.',
+	'TOPIC_UNAPPROVED_FORUM'	=> array(
+		1	=> 'Topic awaiting approval',
+		2	=> 'Topics awaiting approval',
+	),
 	'TOPIC_DELETED'		=> 'This topic has been deleted.',
 	'TOTAL_ATTACHMENTS'	=> 'Attachment(s)',
 	'TOTAL_LOGS'		=> array(
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index eed27b5131..faf100f91b 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -103,7 +103,11 @@
 								<!-- ENDIF -->
 								<br />{forumrow.LAST_POST_TIME}
 							<!-- ELSE -->
-								{L_NO_POSTS}<br />&nbsp;
+							{% if forumrow.U_UNAPPROVED_TOPICS %}
+								{{ lang('TOPIC_UNAPPROVED_FORUM', forumrow.TOPICS) }}<br />
+							{% else %}
+								{{ lang('NO_POSTS') }}<br />
+							{% endif %}
 							<!-- ENDIF -->
 						</span>
 					</dd>

From d3564a4a07299d2c9e6e77fa451b22cf62d077e2 Mon Sep 17 00:00:00 2001
From: battye <battye@phpbb.com>
Date: Sun, 7 Apr 2019 14:30:26 +0000
Subject: [PATCH 2/2] [ticket/15917] Remove br tags

PHPBB3-15917
---
 phpBB/styles/prosilver/template/forumlist_body.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index faf100f91b..8250a1fd07 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -104,9 +104,9 @@
 								<br />{forumrow.LAST_POST_TIME}
 							<!-- ELSE -->
 							{% if forumrow.U_UNAPPROVED_TOPICS %}
-								{{ lang('TOPIC_UNAPPROVED_FORUM', forumrow.TOPICS) }}<br />
+								{{ lang('TOPIC_UNAPPROVED_FORUM', forumrow.TOPICS) }}
 							{% else %}
-								{{ lang('NO_POSTS') }}<br />
+								{{ lang('NO_POSTS') }}
 							{% endif %}
 							<!-- ENDIF -->
 						</span>