FIND:

$refresh = $preview ||

AFTER, ADD:

$orig_word = $replacement_word = array();

FIND:

$topic_type = ( !empty($HTTP_POST_VARS['topictype']) ) ? intval($HTTP_POST_VARS['topictype']) : POST_NORMAL;

AFTER, ADD:

$topic_type = ( in_array($topic_type, array(POST_NORMAL, POST_STICKY, POST_ANNOUNCE)) ) ? $topic_type : POST_NORMAL;

FIND:

		$sql = "SELECT f.*, t.topic_status, t.topic_title  

IN-LINE FIND:

t.topic_title

IN-LINE AFTER, ADD:

, t.topic_type

FIND:

 NOTE --- This is a partial match, the whole line on a fresh installation looks like this:
		$select_sql = ( !$submit ) ? ", t.topic_title, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, p.post_username, pt.post_subject, pt.post_text, pt.bbcode_uid, u.username, u.user_id, u.user_sig" : '';

		$select_sql = ( !$submit ) ? "

IN-LINE FIND:

( !$submit ) ? "

IN-LINE REPLACE WITH:

(!$submit) ? '

IN-LINE FIND:

, u.user_sig

IN-LINE AFTER, ADD:

, u.user_sig_bbcode_uid

IN-LINE FIND:

"

IN-LINE REPLACE WITH:

'

FIND:

		if ( $mode == 'quote' )
		{
			$topic_id = $post_info['topic_id'];
		}

AFTER, ADD:

		if ( $mode == 'newtopic' )
		{
			$post_data['topic_type'] = POST_NORMAL;
		}

FIND:

		$post_data['edit_poll'] = false;
	}

AFTER, ADD:

	if ( $mode == 'poll_delete' && !isset($poll_id) )
	{
		message_die(GENERAL_MESSAGE, $lang['No_such_post']);
	}

FIND:

 NOTE --- This is a partial match, the whole line on a fresh installation looks like this:
		$user_sig = ( $post_info['user_sig'] != '' && $board_config['allow_sig'] ) ? $post_info['user_sig'] : '';

		$user_sig = ( $post_info['user_sig'] != ''

AFTER, ADD:

		$userdata['user_sig_bbcode_uid'] = $post_info['user_sig_bbcode_uid'];