makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10073] Global announcements have a forum_id now

Browse source 
PHPBB3-10073
This commit is contained in:
Joas Schilling 2014-04-13 22:37:49 +02:00
parent ea9756917e
commit af024ea3e5
1 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
phpBB/phpbb/message/topic_form.php
View file

@ -48,33 +48,14 @@ class topic_form extends form
return 'NO_TOPIC';
}
/**
* @todo remove else case when global topics have forum id
*/
if ($this->topic_row['forum_id'])
if (!$this->auth->acl_get('f_read', $this->topic_row['forum_id']))
{
if (!$this->auth->acl_get('f_read', $this->topic_row['forum_id']))
{
return 'SORRY_AUTH_READ';
}
if (!$this->auth->acl_get('f_email', $this->topic_row['forum_id']))
{
return 'NO_EMAIL';
}
return 'SORRY_AUTH_READ';
}
else
{
// If global announcement, we need to check if the user is able to at least read and email in one forum...
if (!$this->auth->acl_getf_global('f_read'))
{
return 'SORRY_AUTH_READ';
}
if (!$this->auth->acl_getf_global('f_email'))
{
return 'NO_EMAIL';
}
if (!$this->auth->acl_get('f_email', $this->topic_row['forum_id']))
{
return 'NO_EMAIL';
}
return false;