aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-10-20 20:51:26 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-10-20 20:51:26 +0200
commit40088005275153b814fa75bdcba95112fb5198f9 (patch)
tree70e777fe9bc6dc25bce2a9af99ab0679b185ee29
parent49ea5a409110a92fb978744944ea813b54bab488 (diff)
parentcbbc64a54fa4dc894b52d8fe6436220f6e6945b2 (diff)
downloadforums-40088005275153b814fa75bdcba95112fb5198f9.tar
forums-40088005275153b814fa75bdcba95112fb5198f9.tar.gz
forums-40088005275153b814fa75bdcba95112fb5198f9.tar.bz2
forums-40088005275153b814fa75bdcba95112fb5198f9.tar.xz
forums-40088005275153b814fa75bdcba95112fb5198f9.zip
Merge branch '3.2.x' into 3.3.x
-rw-r--r--phpBB/includes/functions_posting.php16
1 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index d150845952..53081f14fc 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -114,6 +114,22 @@ function generate_smilies($mode, $forum_id)
}
$db->sql_freeresult($result);
+ /**
+ * Modify smilies before they are assigned to the template
+ *
+ * @event core.generate_smilies_modify_rowset
+ * @var string mode Smiley mode, either window or inline
+ * @var int forum_id Forum where smilies are generated
+ * @var array smilies Smiley rows fetched from the database
+ * @since 3.2.9-RC1
+ */
+ $vars = [
+ 'mode',
+ 'forum_id',
+ 'smilies',
+ ];
+ extract($phpbb_dispatcher->trigger_event('core.generate_smilies_modify_rowset', compact($vars)));
+
if (count($smilies))
{
$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_path_helper->get_web_root_path();