diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-22 23:21:46 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-22 23:21:46 +0200 |
| commit | 73ae52d057e5f5c0cd1e21b20027a34d8e650752 (patch) | |
| tree | 30f019e74ea0394d71695faf9e0b5e1ce4e744be | |
| parent | 127ee62eddf07d705c9b243169db338ee4cbfaef (diff) | |
| parent | aa77367267d381f1f87f1ed725e4f5f4a3135922 (diff) | |
| download | forums-73ae52d057e5f5c0cd1e21b20027a34d8e650752.tar forums-73ae52d057e5f5c0cd1e21b20027a34d8e650752.tar.gz forums-73ae52d057e5f5c0cd1e21b20027a34d8e650752.tar.bz2 forums-73ae52d057e5f5c0cd1e21b20027a34d8e650752.tar.xz forums-73ae52d057e5f5c0cd1e21b20027a34d8e650752.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11728' into develop
* nickvergessen/ticket/11728:
[ticket/11728] Replace topic_approved with topic_visibility
| -rw-r--r-- | phpBB/phpbb/feed/topic.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php index 696b0f5a52..bb1753d823 100644 --- a/phpBB/phpbb/feed/topic.php +++ b/phpBB/phpbb/feed/topic.php @@ -60,7 +60,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base $this->forum_id = (int) $this->topic_data['forum_id']; // Make sure topic is either approved or user authed - if (!$this->topic_data['topic_approved'] && !$this->auth->acl_get('m_approve', $this->forum_id)) + if ($this->topic_data['topic_visibility'] != ITEM_APPROVED && !$this->auth->acl_get('m_approve', $this->forum_id)) { trigger_error('SORRY_AUTH_READ'); } |