diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-22 09:20:18 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-22 09:20:18 +0100 |
| commit | 0a4cc5d2018dde19754f90b30ad49ff2718efc76 (patch) | |
| tree | 0dff9aae696d47017b77a71551d9f75d764543a6 | |
| parent | 4a10062933d9e221e4efd813058adae4c87f3fc2 (diff) | |
| download | forums-0a4cc5d2018dde19754f90b30ad49ff2718efc76.tar forums-0a4cc5d2018dde19754f90b30ad49ff2718efc76.tar.gz forums-0a4cc5d2018dde19754f90b30ad49ff2718efc76.tar.bz2 forums-0a4cc5d2018dde19754f90b30ad49ff2718efc76.tar.xz forums-0a4cc5d2018dde19754f90b30ad49ff2718efc76.zip | |
[ticket/9837] Apply suggested changes by CHItA
PHPBB3-9837
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/content_visibility.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 3b7230b93d..b0c6f7fd1c 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -615,7 +615,7 @@ $lang = array_merge($lang, array( 'POST_TOPIC' => 'Post a new topic', 'POST_UNAPPROVED_ACTION' => 'Post awaiting approval:', 'POST_UNAPPROVED' => 'This post has not been approved.', - 'POST_UNAPPROVED_EXPLAIN' => 'This post is not visible to other users until it has been approved by a moderator', + 'POST_UNAPPROVED_EXPLAIN' => 'This post is not visible to other users until it has been approved by a moderator.', 'POWERED_BY' => 'Powered by %s', 'PREVIEW' => 'Preview', 'PREVIOUS' => 'Previous', // Used in pagination diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php index 457b53653d..fbc56f3db2 100644 --- a/phpBB/phpbb/content_visibility.php +++ b/phpBB/phpbb/content_visibility.php @@ -148,9 +148,9 @@ class content_visibility $poster_key = ($mode === 'topic') ? 'topic_poster' : 'poster_id'; $is_visible = ($visibility == ITEM_APPROVED) || ($this->config['display_unapproved_posts'] && - ($this->user->data['user_id'] <> ANONYMOUS) && + ($this->user->data['user_id'] != ANONYMOUS) && ($visibility == ITEM_UNAPPROVED || $visibility == ITEM_REAPPROVE) && - ($this->user->data['user_id'] === $data[$poster_key])) || + ($this->user->data['user_id'] == $data[$poster_key])) || $this->auth->acl_get('m_approve', $forum_id); /** @@ -226,7 +226,7 @@ class content_visibility $visibility_query = $table_alias . $mode . '_visibility = '; $where_sql .= '(' . $visibility_query . ITEM_APPROVED . ')'; - if ($this->config['display_unapproved_posts'] && ($this->user->data['user_id'] <> ANONYMOUS)) + if ($this->config['display_unapproved_posts'] && ($this->user->data['user_id'] != ANONYMOUS)) { $poster_key = ($mode === 'topic') ? 'topic_poster' : 'poster_id'; $where_sql .= ' OR ((' . $visibility_query . ITEM_UNAPPROVED . ' OR ' . $visibility_query . ITEM_REAPPROVE .')'; |