1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00

Merge pull request #5933 from kasimi/ticket/16424

[ticket/16424] Add base_url to generate_smilies events
This commit is contained in:
Marc Alexander 2020-04-21 21:21:25 +02:00
commit 14cd51056b
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -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)