makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

not unsetting message_parser - a mod or site may want to re-use it.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8620 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-06-08 10:39:44 +00:00
parent ae2b448833
commit 49235d6ed5
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -636,7 +636,6 @@ function compose_pm($id, $mode, $action)
'filename_data' => $message_parser->filename_data, 'filename_data' => $message_parser->filename_data,
'address_list' => $address_list 'address_list' => $address_list
); );
unset($message_parser);
// ((!$message_subject) ? $subject : $message_subject) // ((!$message_subject) ? $subject : $message_subject)
$msg_id = submit_pm($action, $subject, $pm_data); $msg_id = submit_pm($action, $subject, $pm_data);
@ -770,7 +769,6 @@ function compose_pm($id, $mode, $action)
$attachment_data = $message_parser->attachment_data; $attachment_data = $message_parser->attachment_data;
$filename_data = $message_parser->filename_data; $filename_data = $message_parser->filename_data;
$message_text = $message_parser->message; $message_text = $message_parser->message;
unset($message_parser);
// MAIN PM PAGE BEGINS HERE // MAIN PM PAGE BEGINS HERE
@ -892,8 +890,8 @@ function compose_pm($id, $mode, $action)
// Build hidden address list // Build hidden address list
$s_hidden_address_field = build_address_field($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); $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); $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; $urls_checked = (isset($enable_urls)) ? !$enable_urls : 0;
@ -1114,7 +1112,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. * Build the hidden field for the recipients. Needed, as the variable is not read via request_var.
*/ */
function build_address_field($address_list) function build_address_field($address_list)

3
phpBB/posting.php
View file

@ -998,8 +998,6 @@ if ($submit || $preview || $refresh)
$data['topic_replies'] = $post_data['topic_replies']; $data['topic_replies'] = $post_data['topic_replies'];
} }
unset($message_parser);
$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message); $redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message);
$post_need_approval = (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? true : false; $post_need_approval = (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? true : false;
@ -1155,7 +1153,6 @@ if (sizeof($post_data['poll_options']) && $post_data['poll_title'])
$message_parser->decode_message(); $message_parser->decode_message();
$post_data['poll_options'] = explode("\n", $message_parser->message); $post_data['poll_options'] = explode("\n", $message_parser->message);
} }
unset($message_parser);
// MAIN POSTING PAGE BEGINS HERE // MAIN POSTING PAGE BEGINS HERE