From 71e0de5588b6cbd732e2d640ad1eb21d539ae9d9 Mon Sep 17 00:00:00 2001 From: omniError Date: Mon, 10 Nov 2014 22:57:54 -0600 Subject: [PATCH 1/2] [ticket/13328] add core.mcp_view_forum_modify_sql https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328 --- phpBB/includes/mcp/mcp_forum.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 0c6acaa908..b18edbd139 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -165,6 +165,22 @@ function mcp_forum_view($id, $mode, $action, $forum_info) AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.') . " $limit_time_sql ORDER BY t.topic_type DESC, $sort_order_sql"; + + /** + * Modify SQL query before MCP forum view topic list is queried + * + * @event core.mcp_view_forum_modify_sql + * @var string sql SQL query for forum view topic list + * @var int forum_id ID of the forum + * @var string limit_time_sql SQL query part for limit time + * @var string sort_order_sql SQL query part for sort order + * @var int topics_per_page Number of topics per page + * @var int start Start value + * @since 3.1.2-RC1 + */ + $vars = array('sql', 'forum_id', 'limit_time_sql', 'sort_order_sql', 'topics_per_page', 'start'); + extract($phpbb_dispatcher->trigger_event('core.mcp_view_forum_modify_sql', compact($vars))); + $result = $db->sql_query_limit($sql, $topics_per_page, $start); $topic_list = $topic_tracking_info = array(); From b648d3eb4c00aca936274978a427473aaa98138f Mon Sep 17 00:00:00 2001 From: omniError Date: Tue, 11 Nov 2014 10:47:39 -0600 Subject: [PATCH 2/2] [ticket/13328] fix CS https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328 --- phpBB/includes/mcp/mcp_forum.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index b18edbd139..c18ca1aa1d 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -166,20 +166,20 @@ function mcp_forum_view($id, $mode, $action, $forum_info) $limit_time_sql ORDER BY t.topic_type DESC, $sort_order_sql"; - /** - * Modify SQL query before MCP forum view topic list is queried - * - * @event core.mcp_view_forum_modify_sql - * @var string sql SQL query for forum view topic list - * @var int forum_id ID of the forum - * @var string limit_time_sql SQL query part for limit time - * @var string sort_order_sql SQL query part for sort order - * @var int topics_per_page Number of topics per page - * @var int start Start value - * @since 3.1.2-RC1 - */ - $vars = array('sql', 'forum_id', 'limit_time_sql', 'sort_order_sql', 'topics_per_page', 'start'); - extract($phpbb_dispatcher->trigger_event('core.mcp_view_forum_modify_sql', compact($vars))); + /** + * Modify SQL query before MCP forum view topic list is queried + * + * @event core.mcp_view_forum_modify_sql + * @var string sql SQL query for forum view topic list + * @var int forum_id ID of the forum + * @var string limit_time_sql SQL query part for limit time + * @var string sort_order_sql SQL query part for sort order + * @var int topics_per_page Number of topics per page + * @var int start Start value + * @since 3.1.2-RC1 + */ + $vars = array('sql', 'forum_id', 'limit_time_sql', 'sort_order_sql', 'topics_per_page', 'start'); + extract($phpbb_dispatcher->trigger_event('core.mcp_view_forum_modify_sql', compact($vars))); $result = $db->sql_query_limit($sql, $topics_per_page, $start);