From fe9254790c17cc60a5f95c3ff930097f5a5e67b2 Mon Sep 17 00:00:00 2001 From: kasimi Date: Sun, 5 Apr 2020 11:10:53 +0200 Subject: [PATCH] [ticket/16424] Add base_url to generate_smilies events PHPBB3-16424 --- phpBB/includes/functions_posting.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 0ea6adb308..6f83aebe55 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -66,11 +66,14 @@ function generate_smilies($mode, $forum_id) * @event core.generate_smilies_count_sql_before * @var int forum_id Forum where smilies are generated * @var array sql_ary Array with the SQL query + * @var string base_url URL for the "More smilies" link and its pagination * @since 3.2.9-RC1 + * @changed 3.2.10-RC1 Added base_url */ $vars = [ 'forum_id', 'sql_ary', + 'base_url', ]; extract($phpbb_dispatcher->trigger_event('core.generate_smilies_count_sql_before', compact($vars))); @@ -183,9 +186,16 @@ function generate_smilies($mode, $forum_id) * @var string mode Mode of the smilies: window|inline * @var int forum_id The forum ID we are currently in * @var bool display_link Shall we display the "more smilies" link? + * @var string base_url URL for the "More smilies" link and its pagination * @since 3.1.0-a1 + * @changed 3.2.10-RC1 Added base_url */ - $vars = array('mode', 'forum_id', 'display_link'); + $vars = [ + 'mode', + 'forum_id', + 'display_link', + 'base_url', + ]; extract($phpbb_dispatcher->trigger_event('core.generate_smilies_after', compact($vars))); if ($mode == 'inline' && $display_link)