mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 08:17:47 +02:00
Code Issues Releases Wiki Activity

merge...

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8624 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-06-08 21:44:59 +00:00
parent 6a59f3efd6
commit 1aa40171e0
5 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions.php
View File

@@ -1775,7 +1775,7 @@ function redirect($url, $return = false)
{ {
if ($url_parts['host'] !== $user->host) if ($url_parts['host'] !== $user->host)
{ {
$url = generate_board_url(true); $url = generate_board_url();
} }
} }
else if ($url[0] == '/') else if ($url[0] == '/')

2
phpBB/includes/mcp/mcp_warn.php
View File

@@ -258,7 +258,7 @@ class mcp_warn
} }
$redirect = append_sid('mcp', "i=notes&mode=user_notes&u=$user_id"); $redirect = append_sid('mcp', "i=notes&mode=user_notes&u=$user_id");
meta_refresh(2, $redirect); meta_refresh(2, $redirect);
trigger_error($user->lang['USER_WARNING_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>')); trigger_error($msg . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
} }
// OK, they didn't submit a warning so lets build the page for them to do so // OK, they didn't submit a warning so lets build the page for them to do so

2
phpBB/includes/ucp/ucp_pm_compose.php
View File

@@ -635,7 +635,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);
@@ -769,7 +768,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

8
phpBB/install/convertors/convert_phpbb20.php
View File

@@ -31,8 +31,8 @@ unset($dbpasswd);
*/ */
$convertor_data = array( $convertor_data = array(
'forum_name' => 'phpBB 2.0.x', 'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.0', 'version' => '1.0.2',
'phpbb_version' => '3.0.0', 'phpbb_version' => '3.0.2',
'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>', 'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>',
'dbms' => $dbms, 'dbms' => $dbms,
'dbhost' => $dbhost, 'dbhost' => $dbhost,
@@ -489,7 +489,9 @@ if (!$get_info)
array('poll_max_options', 1, ''), array('poll_max_options', 1, ''),
array('poll_vote_change', 0, ''), array('poll_vote_change', 0, ''),
'left_join' => 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1', 'left_join' => array ( 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1',
'topics LEFT JOIN posts ON topics.topic_last_post_id = posts.post_id',
),
'where' => 'topics.topic_moved_id = 0', 'where' => 'topics.topic_moved_id = 0',
), ),

3
phpBB/posting.php
View File

@@ -998,8 +998,6 @@ if ($submit || $preview || $refresh)
$data['topic_replies'] = (int) $post_data['topic_replies']; $data['topic_replies'] = (int) $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