1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 16:05:00 +02:00

Merge branch '3.1.x'

This commit is contained in:
Joas Schilling 2015-02-20 22:26:47 +01:00
commit 3657d7a85a

View File

@ -252,7 +252,7 @@ class content_visibility
* @event core.phpbb_content_visibility_get_global_visibility_before * @event core.phpbb_content_visibility_get_global_visibility_before
* @var array where_sqls The action the user tried to execute * @var array where_sqls The action the user tried to execute
* @var string mode Either "topic" or "post" depending on the query this is being used in * @var string mode Either "topic" or "post" depending on the query this is being used in
* @var array forum_ids Array of forum ids which the posts/topics are limited to * @var array exclude_forum_ids Array of forum ids the current user doesn't have access to
* @var string table_alias Table alias to prefix in SQL queries * @var string table_alias Table alias to prefix in SQL queries
* @var array approve_forums Array of forums where the user has m_approve permissions * @var array approve_forums Array of forums where the user has m_approve permissions
* @var string visibility_sql_overwrite Forces the function to return an implosion of where_sqls (joined by "OR") * @var string visibility_sql_overwrite Forces the function to return an implosion of where_sqls (joined by "OR")
@ -261,7 +261,7 @@ class content_visibility
$vars = array( $vars = array(
'where_sqls', 'where_sqls',
'mode', 'mode',
'forum_ids', 'exclude_forum_ids',
'table_alias', 'table_alias',
'approve_forums', 'approve_forums',
'visibility_sql_overwrite', 'visibility_sql_overwrite',