diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 5 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6d582b96f8..4d676ad80b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -228,8 +228,8 @@ p a { <li>[Fix] Outbox messages are no always neither new nor unread post-conversion (Bug #11461)</li> <li>[Feature] Replaced outdated jabber class with the one from the flyspray project</li> <li>[Feature] The converter no longer relies on the smiley ID to decide if it should be displayed on the posting page</li> - <li>Limit maximum number of allowed characters in messages to 60.000 by default. Admins should increase their PHP time limits if they want to raise this tremedously.</li> - <li>Some changes to the conversion documentation</li> + <li> Limit maximum number of allowed characters in messages to 60.000 by default. Admins should increase their PHP time limits if they want to raise this tremedously.</li> + <li> Some changes to the conversion documentation</li> <li>[Fix] Only use permissions from existing forums during the conversion (Bug #11417)</li> <li>[Fix] Do not permit the decimal as a valid prefix character (Bug #11967)</li> <li>[Fix] Account for the fact that the IM fields might hold non-IM information</li> @@ -239,6 +239,7 @@ p a { <li>[Sec] Adding confirm boxes to UCP group actions (ToonArmy)</li> <li>[Feature] Added the option to disable the flash bbcode globally (DelvarWorld).</li> <li>[Sec] Changed the embedding of Flash (NeoThermic, DelvarWorld).</li> + <li>[Fix] Use the signature setting for PMs (Bug #12001)</li> </ul> diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 7b740c1515..6718094c75 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -377,7 +377,7 @@ function compose_pm($id, $mode, $action) if (!in_array($action, array('quote', 'edit', 'delete', 'forward'))) { - $enable_sig = ($config['allow_sig'] && $auth->acl_get('u_sig') && $user->optionget('attachsig')); + $enable_sig = ($config['allow_sig'] && $config['allow_sig_pm'] && $auth->acl_get('u_sig') && $user->optionget('attachsig')); $enable_smilies = ($config['allow_smilies'] && $auth->acl_get('u_pm_smilies') && $user->optionget('smilies')); $enable_bbcode = ($config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode') && $user->optionget('bbcode')); $enable_urls = true; @@ -516,7 +516,7 @@ function compose_pm($id, $mode, $action) $enable_bbcode = (!$bbcode_status || isset($_POST['disable_bbcode'])) ? false : true; $enable_smilies = (!$smilies_status || isset($_POST['disable_smilies'])) ? false : true; $enable_urls = (isset($_POST['disable_magic_url'])) ? 0 : 1; - $enable_sig = (!$config['allow_sig']) ? false : ((isset($_POST['attach_sig'])) ? true : false); + $enable_sig = (!$config['allow_sig'] ||!$config['allow_sig_pm']) ? false : ((isset($_POST['attach_sig'])) ? true : false); if ($submit) { @@ -925,7 +925,7 @@ function compose_pm($id, $mode, $action) 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', 'S_SMILIES_ALLOWED' => $smilies_status, 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', - 'S_SIG_ALLOWED' => ($config['allow_sig'] && $auth->acl_get('u_sig')), + 'S_SIG_ALLOWED' => ($config['allow_sig'] && $config['allow_sig_pm'] && $auth->acl_get('u_sig')), 'S_SIGNATURE_CHECKED' => ($sig_checked) ? ' checked="checked"' : '', 'S_LINKS_ALLOWED' => $url_status, 'S_MAGIC_URL_CHECKED' => ($urls_checked) ? ' checked="checked"' : '', |