From 9caec668afa2ecadb38bc5440a064d4fa69bf8b1 Mon Sep 17 00:00:00 2001 From: brunoais Date: Sat, 29 Nov 2014 15:26:16 +0000 Subject: [PATCH] [ticket/13147] Renaming content_replaced->get_global_visibility_sql_overwrite Renamed content_replaced to get_global_visibility_sql_overwrite in order to follow the convention in other events' variables that have the same basic function PHPBB3-13147 --- phpBB/phpbb/content_visibility.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php index 53ba50ef7c..5443283f23 100644 --- a/phpBB/phpbb/content_visibility.php +++ b/phpBB/phpbb/content_visibility.php @@ -244,17 +244,17 @@ class content_visibility $approve_forums = array_diff(array_keys($this->auth->acl_getf('m_approve', true)), $exclude_forum_ids); - $content_replaced = null; + $get_global_visibility_sql_overwrite = null; /** * Allow changing the result of calling get_global_visibility_sql * * @event core.phpbb_content_visibility_get_global_visibility_before - * @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 array forum_ids Array of forum ids which the posts/topics are limited to - * @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 string content_replaced Forces the function to return an implosion of where_sqls (joined by "OR") + * @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 array forum_ids Array of forum ids which the posts/topics are limited to + * @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 string get_global_visibility_sql_overwrite Forces the function to return an implosion of where_sqls (joined by "OR") * @since 3.1.3-RC1 */ $vars = array( @@ -263,13 +263,13 @@ class content_visibility 'forum_ids', 'table_alias', 'approve_forums', - 'content_replaced', + 'get_global_visibility_sql_overwrite', ); extract($this->phpbb_dispatcher->trigger_event('core.phpbb_content_visibility_get_global_visibility_before', compact($vars))); - if ($content_replaced) + if ($get_global_visibility_sql_overwrite) { - return $content_replaced; + return $get_global_visibility_sql_overwrite; }