makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 13:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-04-21 21:21:49 +02:00
commit 8de73183e8
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/functions_posting.php
View file

@ -66,11 +66,14 @@ function generate_smilies($mode, $forum_id)
* @event core.generate_smilies_count_sql_before * @event core.generate_smilies_count_sql_before
* @var int forum_id Forum where smilies are generated * @var int forum_id Forum where smilies are generated
* @var array sql_ary Array with the SQL query * @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 * @since 3.2.9-RC1
* @changed 3.2.10-RC1 Added base_url
*/ */
$vars = [ $vars = [
'forum_id', 'forum_id',
'sql_ary', 'sql_ary',
'base_url',
]; ];
extract($phpbb_dispatcher->trigger_event('core.generate_smilies_count_sql_before', compact($vars))); 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 string mode Mode of the smilies: window|inline
* @var int forum_id The forum ID we are currently in * @var int forum_id The forum ID we are currently in
* @var bool display_link Shall we display the "more smilies" link? * @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 * @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))); extract($phpbb_dispatcher->trigger_event('core.generate_smilies_after', compact($vars)));
if ($mode == 'inline' && $display_link) if ($mode == 'inline' && $display_link)