mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-12 11:44:08 +02:00
merge...
git-svn-id: file:///svn/phpbb/trunk@8624 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -635,7 +635,6 @@ function compose_pm($id, $mode, $action)
|
||||
'filename_data' => $message_parser->filename_data,
|
||||
'address_list' => $address_list
|
||||
);
|
||||
unset($message_parser);
|
||||
|
||||
// ((!$message_subject) ? $subject : $message_subject)
|
||||
$msg_id = submit_pm($action, $subject, $pm_data);
|
||||
@@ -769,7 +768,6 @@ function compose_pm($id, $mode, $action)
|
||||
$attachment_data = $message_parser->attachment_data;
|
||||
$filename_data = $message_parser->filename_data;
|
||||
$message_text = $message_parser->message;
|
||||
unset($message_parser);
|
||||
|
||||
// MAIN PM PAGE BEGINS HERE
|
||||
|
||||
@@ -891,8 +889,8 @@ function compose_pm($id, $mode, $action)
|
||||
|
||||
// Build hidden address list
|
||||
$s_hidden_address_field = build_address_field($address_list);
|
||||
|
||||
|
||||
|
||||
|
||||
$bbcode_checked = (isset($enable_bbcode)) ? !$enable_bbcode : (($config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode')) ? !$user->optionget('bbcode') : 1);
|
||||
$smilies_checked = (isset($enable_smilies)) ? !$enable_smilies : (($config['allow_smilies'] && $auth->acl_get('u_pm_smilies')) ? !$user->optionget('smilies') : 1);
|
||||
$urls_checked = (isset($enable_urls)) ? !$enable_urls : 0;
|
||||
@@ -1113,7 +1111,7 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Build the hidden field for the recipients. Needed, as the variable is not read via request_var.
|
||||
*/
|
||||
function build_address_field($address_list)
|
||||
|
Reference in New Issue
Block a user