Merge branch '2.1.x'

This commit is contained in:
Marc Alexander
2015-06-06 18:17:19 +02:00
23 changed files with 196 additions and 185 deletions

View File

@@ -119,7 +119,7 @@ class helper
*/
protected function check_permission()
{
if (!isset($this->config['board3_enable']) || !$this->config['board3_enable'] || !$this->auth->acl_get('u_view_portal'))
if (empty($this->config['board3_enable']) || !$this->auth->acl_get('u_view_portal'))
{
redirect(append_sid($this->phpbb_root_path . 'index' . $this->php_ext));
}
@@ -178,7 +178,9 @@ class helper
}
/**
* Check if user is in required groups
* Check if user is in required groups.
* If the group_ary is empty, this means that there are no limitation on
* which groups can see this module.
*
* @param array $row Module row
*