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

Moved some code around, nothing serious.

Browse source 
Attention, bbcode() constructor now accepts only one argument: bbcode_bitfield


git-svn-id: file:///svn/phpbb/trunk@3858 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2003-04-16 21:16:57 +00:00
parent aaa2c6faab
commit f641d8a0bb
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
phpBB/posting.php
View file

@ -181,8 +181,6 @@ if ($sql != '')
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
$message_parser->bbcode_uid = $row['bbcode_uid'];
$forum_id = intval($row['forum_id']); $forum_id = intval($row['forum_id']);
$topic_id = intval($row['topic_id']); $topic_id = intval($row['topic_id']);
$post_id = intval($row['post_id']); $post_id = intval($row['post_id']);
@ -376,6 +374,11 @@ if ( ($mode == 'edit') && ($post_edit_locked) && (!$auth->acl_gets('m_', 'a_', $
$message_parser = new parse_message(0); // <- TODO: add constant (MSG_POST/MSG_PM) $message_parser = new parse_message(0); // <- TODO: add constant (MSG_POST/MSG_PM)
if ($mode == 'edit')
{
$message_parser->bbcode_uid = $row['bbcode_uid'];
}
// Delete triggered ? // Delete triggered ?
if ( ($mode == 'delete') && ((($poster_id == $user->data['user_id']) && ($user->data['user_id'] != ANONYMOUS) && ($perm['u_delete']) && ($post_id == $topic_last_post_id)) || ($perm['m_delete'])) ) if ( ($mode == 'delete') && ((($poster_id == $user->data['user_id']) && ($user->data['user_id'] != ANONYMOUS) && ($perm['u_delete']) && ($post_id == $topic_last_post_id)) || ($perm['m_delete'])) )
{ {
@ -668,11 +671,8 @@ if ($preview)
$post_time = $current_time; $post_time = $current_time;
// DEBUG
// $message_parser->bbcode_bitfield = bindec('1111111111');
include($phpbb_root_path . 'includes/bbcode.' . $phpEx); include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
$bbcode = new bbcode($message_parser->bbcode_uid, $message_parser->bbcode_bitfield); $bbcode = new bbcode($message_parser->bbcode_bitfield);
$preview_message = format_display($message_parser->message, $enable_html, $enable_bbcode, $message_parser->bbcode_uid, $enable_urls, $enable_smilies, $enable_sig); $preview_message = format_display($message_parser->message, $enable_html, $enable_bbcode, $message_parser->bbcode_uid, $enable_urls, $enable_smilies, $enable_sig);
@ -700,12 +700,18 @@ if ($preview)
// Decode text for message display // Decode text for message display
decode_text($post_text, $message_parser->bbcode_uid); decode_text($post_text, $message_parser->bbcode_uid);
decode_text($subject, $message_parser->bbcode_uid); if ($subject)
{
decode_text($subject, $message_parser->bbcode_uid);
}
// Save us some processing time. ;) // Save us some processing time. ;)
$poll_options_tmp = implode("\n", $poll_options); if (count($poll_options_tmp))
decode_text($poll_options_tmp); {
$poll_options = explode("\n", $poll_options_tmp); $poll_options_tmp = implode("\n", $poll_options);
decode_text($poll_options_tmp);
$poll_options = explode("\n", $poll_options_tmp);
}
if (($mode == 'quote') && (!$preview) && (!$refresh)) if (($mode == 'quote') && (!$preview) && (!$refresh))
{ {