diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-05-15 23:57:16 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-05-15 23:57:16 +0200 |
| commit | 94d2be725aedbe1780d7a45adde0f210eefe0aa7 (patch) | |
| tree | ba58b93568020672dbd1f890e4bc0075c92cd383 | |
| parent | 40a00bd4e550c449612d56acf75ceec3a5df7bc3 (diff) | |
| parent | e7262e2d39feb7946710f6ae4bb17aac67f26204 (diff) | |
| download | forums-94d2be725aedbe1780d7a45adde0f210eefe0aa7.tar forums-94d2be725aedbe1780d7a45adde0f210eefe0aa7.tar.gz forums-94d2be725aedbe1780d7a45adde0f210eefe0aa7.tar.bz2 forums-94d2be725aedbe1780d7a45adde0f210eefe0aa7.tar.xz forums-94d2be725aedbe1780d7a45adde0f210eefe0aa7.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/includes/ucp/ucp_profile.php
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index c65bb83eae..aec11eefe8 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -490,6 +490,32 @@ class ucp_profile } } + /** + * Modify user signature on editing profile in UCP + * + * @event core.ucp_profile_modify_signature + * @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 string signature Users signature text + * @var object message_parser The message parser object + * @var array error Any error strings + * @var bool submit Whether or not the form has been sumitted + * @var bool preview Whether or not the signature is being previewed + * @since 3.1.10-RC1 + * @change 3.2.0-RC2 Removed message parser + */ + $vars = array( + 'enable_bbcode', + 'enable_smilies', + 'enable_urls', + 'signature', + 'error', + 'submit', + 'preview', + ); + extract($phpbb_dispatcher->trigger_event('core.ucp_profile_modify_signature', compact($vars))); + $bbcode_uid = $bbcode_bitfield = $bbcode_flags = ''; $warn_msg = generate_text_for_storage( $signature, |