makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9837] Apply suggested changes by CHItA

Browse source 
PHPBB3-9837
This commit is contained in:
Marc Alexander 2019-11-22 09:20:18 +01:00
parent 4a10062933
commit 0a4cc5d201
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/language/en/common.php
View file

@ -615,7 +615,7 @@ $lang = array_merge($lang, array(
'POST_TOPIC' => 'Post a new topic', 'POST_TOPIC' => 'Post a new topic',
'POST_UNAPPROVED_ACTION' => 'Post awaiting approval:', 'POST_UNAPPROVED_ACTION' => 'Post awaiting approval:',
'POST_UNAPPROVED' => 'This post has not been approved.', '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', 'POWERED_BY' => 'Powered by %s',
'PREVIEW' => 'Preview', 'PREVIEW' => 'Preview',
'PREVIOUS' => 'Previous', // Used in pagination 'PREVIOUS' => 'Previous', // Used in pagination

6
phpBB/phpbb/content_visibility.php
View file

@ -148,9 +148,9 @@ class content_visibility
$poster_key = ($mode === 'topic') ? 'topic_poster' : 'poster_id'; $poster_key = ($mode === 'topic') ? 'topic_poster' : 'poster_id';
$is_visible = ($visibility == ITEM_APPROVED) || $is_visible = ($visibility == ITEM_APPROVED) ||
($this->config['display_unapproved_posts'] && ($this->config['display_unapproved_posts'] &&
($this->user->data['user_id'] <> ANONYMOUS) && ($this->user->data['user_id'] != ANONYMOUS) &&
($visibility == ITEM_UNAPPROVED || $visibility == ITEM_REAPPROVE) && ($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); $this->auth->acl_get('m_approve', $forum_id);
/** /**
@ -226,7 +226,7 @@ class content_visibility
$visibility_query = $table_alias . $mode . '_visibility = '; $visibility_query = $table_alias . $mode . '_visibility = ';
$where_sql .= '(' . $visibility_query . ITEM_APPROVED . ')'; $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'; $poster_key = ($mode === 'topic') ? 'topic_poster' : 'poster_id';
$where_sql .= ' OR ((' . $visibility_query . ITEM_UNAPPROVED . ' OR ' . $visibility_query . ITEM_REAPPROVE .')'; $where_sql .= ' OR ((' . $visibility_query . ITEM_UNAPPROVED . ' OR ' . $visibility_query . ITEM_REAPPROVE .')';