diff options
| -rw-r--r-- | .github/CONTRIBUTING.md (renamed from CONTRIBUTING.md) | 0 | ||||
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 10 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3fceabda10..3fceabda10 100644 --- a/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..39eb83e454 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,10 @@ +Checklist: + +- [ ] Correct branch: master for new features; 3.2.x, 3.1.x for fixes +- [ ] Tests pass +- [ ] Code follows coding guidelines: [master / 3.2.x](https://area51.phpbb.com/docs/master/coding-guidelines.html), [3.1.x](https://area51.phpbb.com/docs/31x/coding-guidelines.html) +- [ ] Commit follows commit message [format](https://wiki.phpbb.com/Git#Commit_Messages) + +Tracker ticket (set the ticket ID to **your ticket ID**): + +https://tracker.phpbb.com/browse/PHPBB3-12345 diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index c48df2c34d..64c49e17ac 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -470,6 +470,8 @@ class ucp_profile include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + $preview = $request->is_set_post('preview'); + $enable_bbcode = ($config['allow_sig_bbcode']) ? $user->optionget('sig_bbcode') : false; $enable_smilies = ($config['allow_sig_smilies']) ? $user->optionget('sig_smilies') : false; $enable_urls = ($config['allow_sig_links']) ? $user->optionget('sig_links') : false; @@ -478,7 +480,7 @@ class ucp_profile $signature = $request->variable('signature', $decoded_message['text'], true); $signature_preview = ''; - if ($submit || $request->is_set_post('preview')) + if ($submit || $preview) { $enable_bbcode = ($config['allow_sig_bbcode']) ? !$request->variable('disable_bbcode', false) : false; $enable_smilies = ($config['allow_sig_smilies']) ? !$request->variable('disable_smilies', false) : false; |