diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2018-05-13 13:13:38 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-21 13:44:19 +0100 |
| commit | 01b0ec19c681b76b59ae37c77d56357b2197bb8b (patch) | |
| tree | 05793cf3f13a4d13cedc581253f593b96e1a20a2 | |
| parent | eb94fe973bbf7b56e61b0287cf9a765197bed27c (diff) | |
| download | forums-01b0ec19c681b76b59ae37c77d56357b2197bb8b.tar forums-01b0ec19c681b76b59ae37c77d56357b2197bb8b.tar.gz forums-01b0ec19c681b76b59ae37c77d56357b2197bb8b.tar.bz2 forums-01b0ec19c681b76b59ae37c77d56357b2197bb8b.tar.xz forums-01b0ec19c681b76b59ae37c77d56357b2197bb8b.zip | |
[ticket/9837] Small fixes
PHPBB3-9837
| -rw-r--r-- | phpBB/phpbb/content_visibility.php | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 2 |
3 files changed, 6 insertions, 5 deletions
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; } |