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

do not update post_text if the message content was not changed... (fixing a bug ;))

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4938 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2004-07-27 19:47:27 +00:00
parent bfec4fb8fc
commit 895f262eb5
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
phpBB/posting.php
View file

@ -561,13 +561,19 @@ if ($submit || $preview || $refresh)
// Grab md5 'checksum' of new message // Grab md5 'checksum' of new message
$message_md5 = md5($message_parser->message); $message_md5 = md5($message_parser->message);
$update_message = ($mode != 'edit' || $message_md5 != $post_checksum || $status_switch || $preview) ? true : false;
// Check checksum ... don't re-parse message if the same // Check checksum ... don't re-parse message if the same
if ($mode != 'edit' || $message_md5 != $post_checksum || $status_switch || $preview)
// Parse message
if ($update_message)
{ {
// Parse message
$message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies, $img_status, $flash_status, $quote_status); $message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies, $img_status, $flash_status, $quote_status);
} }
else
{
$message_parser->bbcode_bitfield = $bbcode_bitfield;
}
if ($mode != 'edit' && !$preview && !$refresh && $config['flood_interval'] && !$auth->acl_get('f_ignoreflood', $forum_id)) if ($mode != 'edit' && !$preview && !$refresh && $config['flood_interval'] && !$auth->acl_get('f_ignoreflood', $forum_id))
{ {
@ -767,7 +773,7 @@ if ($submit || $preview || $refresh)
'bbcode_bitfield' => (int) $message_parser->bbcode_bitfield 'bbcode_bitfield' => (int) $message_parser->bbcode_bitfield
); );
submit_post($mode, $message_parser->message, $subject, $username, $topic_type, $message_parser->bbcode_uid, $poll, $message_parser->attachment_data, $message_parser->filename_data, $post_data); submit_post($mode, $message_parser->message, $subject, $username, $topic_type, $message_parser->bbcode_uid, $poll, $message_parser->attachment_data, $message_parser->filename_data, $post_data, $update_message);
} }
} }
@ -1191,7 +1197,7 @@ function delete_post($mode, $post_id, $topic_id, $forum_id, $data)
// Submit Post // Submit Post
function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_uid, $poll, $attach_data, $filename_data, $data) function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_uid, $poll, $attach_data, $filename_data, $data, $update_message = true)
{ {
global $db, $auth, $user, $config, $phpEx, $SID, $template, $phpbb_root_path; global $db, $auth, $user, $config, $phpEx, $SID, $template, $phpbb_root_path;
@ -1206,10 +1212,12 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
if ($mode == 'post') if ($mode == 'post')
{ {
$post_mode = 'post'; $post_mode = 'post';
$update_message = true;
} }
else if ($mode != 'edit') else if ($mode != 'edit')
{ {
$post_mode = 'reply'; $post_mode = 'reply';
$update_message = true;
} }
else if ($mode == 'edit') else if ($mode == 'edit')
{ {
@ -1290,7 +1298,6 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
'enable_sig' => $data['enable_sig'], 'enable_sig' => $data['enable_sig'],
'post_username' => ($username && $data['poster_id'] == ANONYMOUS) ? stripslashes($username) : '', 'post_username' => ($username && $data['poster_id'] == ANONYMOUS) ? stripslashes($username) : '',
'post_subject' => $subject, 'post_subject' => $subject,
'post_text' => $message,
'post_edit_reason' => $data['post_edit_reason'], 'post_edit_reason' => $data['post_edit_reason'],
'post_edit_user' => (int) $data['post_edit_user'], 'post_edit_user' => (int) $data['post_edit_user'],
'post_checksum' => $data['message_md5'], 'post_checksum' => $data['message_md5'],
@ -1300,7 +1307,13 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
'bbcode_uid' => $bbcode_uid, 'bbcode_uid' => $bbcode_uid,
'post_edit_locked' => $data['post_edit_locked']) 'post_edit_locked' => $data['post_edit_locked'])
); );
break;
if ($update_message)
{
$sql_data[POSTS_TABLE]['sql']['post_text'] = $message;
}
break;
} }
// And the topic ladies and gentlemen // And the topic ladies and gentlemen