From 01b0ec19c681b76b59ae37c77d56357b2197bb8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Bartus?= <mate.bartus@gmail.com>
Date: Sun, 13 May 2018 13:13:38 +0200
Subject: [ticket/9837] Small fixes

PHPBB3-9837
---
 phpBB/phpbb/content_visibility.php                  | 7 ++++---
 phpBB/styles/prosilver/template/viewtopic_body.html | 2 +-
 phpBB/styles/prosilver/theme/colours.css            | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php
index 4633ec24c2..8249e9c36d 100644
--- a/phpBB/phpbb/content_visibility.php
+++ b/phpBB/phpbb/content_visibility.php
@@ -146,9 +146,10 @@ class content_visibility
 	{
 		$visibility = $data[$mode . '_visibility'];
 		$poster_key = ($mode === 'topic') ? 'topic_poster' : 'poster_id';
-		$is_visible = $this->auth->acl_get('m_approve', $forum_id) || $visibility == ITEM_APPROVED || (
-			($visibility == ITEM_UNAPPROVED || $visibility == ITEM_REAPPROVE) &&
-			$this->user->data['user_id'] === $data[$poster_key]
+		$is_visible = $this->auth->acl_get('m_approve', $forum_id) || $visibility == ITEM_APPROVED;
+		$is_visible = $is_visible || (
+			($visibility == ITEM_UNAPPROVED || $visibility == ITEM_REAPPROVE)
+			&& $this->user->data['user_id'] === $data[$poster_key]
 		);
 
 		/**
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 5a469b8d85..16e28651bf 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -306,7 +306,7 @@
 				</p>
 			</form>
 			<!-- ELSE -->
-				<p class="information post-notice">
+				<p class="post-notice information">
 					{L_POST_UNAPPROVED}
 				</p>
 			<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index d8ee4f73a7..c44b5cd37d 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1162,6 +1162,6 @@ li.notification-reported strong, li.notification-disapproved strong {
 	color: #ffffff;
 }
 
-p.information {
+.information {
 	background-color: #b8d3e0;
 }
-- 
cgit v1.2.1