makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-11-22 21:40:26 +01:00
commit 75efe14228
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -687,6 +687,27 @@ function compose_pm($id, $mode, $action, $user_folders = array())
$flash_status = ($config['auth_flash_pm'] && $auth->acl_get('u_pm_flash')) ? true : false; $flash_status = ($config['auth_flash_pm'] && $auth->acl_get('u_pm_flash')) ? true : false;
$url_status = ($config['allow_post_links']) ? true : false; $url_status = ($config['allow_post_links']) ? true : false;
/**
* Event to override private message BBCode status indications
*
* @event core.ucp_pm_compose_modify_bbcode_status
*
* @var bool bbcode_status BBCode status
* @var bool smilies_status Smilies status
* @var bool img_status Image BBCode status
* @var bool flash_status Flash BBCode status
* @var bool url_status URL BBCode status
* @since 3.3.3-RC1
*/
$vars = [
'bbcode_status',
'smilies_status',
'img_status',
'flash_status',
'url_status',
];
extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_bbcode_status', compact($vars)));
// Save Draft // Save Draft
if ($save && $auth->acl_get('u_savedrafts')) if ($save && $auth->acl_get('u_savedrafts'))
{ {

23
phpBB/posting.php
View file

@ -729,6 +729,29 @@ $url_status = ($config['allow_post_links']) ? true : false;
$flash_status = ($bbcode_status && $auth->acl_get('f_flash', $forum_id) && $config['allow_post_flash']) ? true : false; $flash_status = ($bbcode_status && $auth->acl_get('f_flash', $forum_id) && $config['allow_post_flash']) ? true : false;
$quote_status = true; $quote_status = true;
/**
* Event to override message BBCode status indications
*
* @event core.posting_modify_bbcode_status
*
* @var bool bbcode_status BBCode status
* @var bool smilies_status Smilies status
* @var bool img_status Image BBCode status
* @var bool url_status URL BBCode status
* @var bool flash_status Flash BBCode status
* @var bool quote_status Quote BBCode status
* @since 3.3.3-RC1
*/
$vars = [
'bbcode_status',
'smilies_status',
'img_status',
'url_status',
'flash_status',
'quote_status',
];
extract($phpbb_dispatcher->trigger_event('core.posting_modify_bbcode_status', compact($vars)));
// Save Draft // Save Draft
if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote')) if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote'))
{ {