mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 05:18:52 +00:00
Merge branch '3.2.x'
This commit is contained in:
commit
f1306cf9ff
1 changed files with 28 additions and 0 deletions
|
@ -739,6 +739,34 @@ function compose_pm($id, $mode, $action, $user_folders = array())
|
||||||
$enable_urls = (isset($_POST['disable_magic_url'])) ? 0 : 1;
|
$enable_urls = (isset($_POST['disable_magic_url'])) ? 0 : 1;
|
||||||
$enable_sig = (!$config['allow_sig'] ||!$config['allow_sig_pm']) ? false : ((isset($_POST['attach_sig'])) ? true : false);
|
$enable_sig = (!$config['allow_sig'] ||!$config['allow_sig_pm']) ? false : ((isset($_POST['attach_sig'])) ? true : false);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modify private message
|
||||||
|
*
|
||||||
|
* @event core.ucp_pm_compose_modify_parse_before
|
||||||
|
* @var bool enable_bbcode Whether or not bbcode is enabled
|
||||||
|
* @var bool enable_smilies Whether or not smilies are enabled
|
||||||
|
* @var bool enable_urls Whether or not urls are enabled
|
||||||
|
* @var bool enable_sig Whether or not signature is enabled
|
||||||
|
* @var string subject PM subject text
|
||||||
|
* @var object message_parser The message parser object
|
||||||
|
* @var bool submit Whether or not the form has been sumitted
|
||||||
|
* @var bool preview Whether or not the signature is being previewed
|
||||||
|
* @var array error Any error strings
|
||||||
|
* @since 3.1.10-RC1
|
||||||
|
*/
|
||||||
|
$vars = array(
|
||||||
|
'enable_bbcode',
|
||||||
|
'enable_smilies',
|
||||||
|
'enable_urls',
|
||||||
|
'enable_sig',
|
||||||
|
'subject',
|
||||||
|
'message_parser',
|
||||||
|
'submit',
|
||||||
|
'preview',
|
||||||
|
'error',
|
||||||
|
);
|
||||||
|
extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_parse_before', compact($vars)));
|
||||||
|
|
||||||
// Parse Attachments - before checksum is calculated
|
// Parse Attachments - before checksum is calculated
|
||||||
$message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true);
|
$message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue