diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 17:18:40 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 17:20:45 +0200 |
| commit | 79d6d53296fbbbf829b061192ae00b093e4b0158 (patch) | |
| tree | fda6fdc7b5e05c89129d2ba02b65e64310f204e8 | |
| parent | 6a73188e6a194d268958251c184cd9a29b9f02ef (diff) | |
| parent | 6764bea40c0c589a9b3ed99725fa8d731ad9a298 (diff) | |
| download | forums-79d6d53296fbbbf829b061192ae00b093e4b0158.tar forums-79d6d53296fbbbf829b061192ae00b093e4b0158.tar.gz forums-79d6d53296fbbbf829b061192ae00b093e4b0158.tar.bz2 forums-79d6d53296fbbbf829b061192ae00b093e4b0158.tar.xz forums-79d6d53296fbbbf829b061192ae00b093e4b0158.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/includes/ucp/ucp_pm_compose.php
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 1132271689..ad9a99204f 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -739,6 +739,34 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $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); + /** + * 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 $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true); |