diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-08 10:39:44 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-08 10:39:44 +0000 |
| commit | 49235d6ed5dd4cac42ddcc3cab75b05f976c5d13 (patch) | |
| tree | d197c75934d95992b2fd2dff8ab3e3b8e6a150d0 /phpBB | |
| parent | ae2b448833d885a67256cce20e11250cfb87e6c6 (diff) | |
| download | forums-49235d6ed5dd4cac42ddcc3cab75b05f976c5d13.tar forums-49235d6ed5dd4cac42ddcc3cab75b05f976c5d13.tar.gz forums-49235d6ed5dd4cac42ddcc3cab75b05f976c5d13.tar.bz2 forums-49235d6ed5dd4cac42ddcc3cab75b05f976c5d13.tar.xz forums-49235d6ed5dd4cac42ddcc3cab75b05f976c5d13.zip | |
not unsetting message_parser - a mod or site may want to re-use it.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8620 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 8 | ||||
| -rw-r--r-- | phpBB/posting.php | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index af592e3612..6271639cd1 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -636,7 +636,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); @@ -770,7 +769,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 @@ -892,8 +890,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; @@ -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. */ function build_address_field($address_list) diff --git a/phpBB/posting.php b/phpBB/posting.php index dfe7b348a7..4769c1f592 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -998,8 +998,6 @@ if ($submit || $preview || $refresh) $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); $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(); $post_data['poll_options'] = explode("\n", $message_parser->message); } -unset($message_parser); // MAIN POSTING PAGE BEGINS HERE |