[Phpbb-checkins] CVS: phpBB2 posting.php,1.159,1.159.2.1

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv28108

Modified Files:
      Tag: phpBB-2_0_0
	posting.php 
Log Message:
Fix 'forget' topic type when previewing.

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.159
retrieving revision 1.159.2.1
diff -C2 -r1.159 -r1.159.2.1
*** posting.php	1 Apr 2002 20:07:51 -0000	1.159
--- posting.php	7 Apr 2002 00:21:50 -0000	1.159.2.1
***************
*** 83,97 ****
  	{
  		$redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
! 		$post_append = "";
  	}
  	else if ( $forum_id )
  	{
  		$redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
! 		$post_append = "";
  	}
  	else
  	{
  		$redirect = "index.$phpEx";
! 		$post_append = "";
  	}
  
--- 83,97 ----
  	{
  		$redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
! 		$post_append = '';
  	}
  	else if ( $forum_id )
  	{
  		$redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
! 		$post_append = '';
  	}
  	else
  	{
  		$redirect = "index.$phpEx";
! 		$post_append = '';
  	}
  
***************
*** 872,876 ****
  	{
  		$topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_STICKY . '"';
! 		if ( $post_data['topic_type'] == POST_STICKY )
  		{
  			$topic_type_toggle .= ' checked="checked"';
--- 872,876 ----
  	{
  		$topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_STICKY . '"';
! 		if ( $post_data['topic_type'] == POST_STICKY || $topic_type == POST_STICKY )
  		{
  			$topic_type_toggle .= ' checked="checked"';
***************
*** 882,886 ****
  	{
  		$topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_ANNOUNCE . '"';
! 		if ( $post_data['topic_type'] == POST_ANNOUNCE )
  		{
  			$topic_type_toggle .= ' checked="checked"';
--- 882,886 ----
  	{
  		$topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_ANNOUNCE . '"';
! 		if ( $post_data['topic_type'] == POST_ANNOUNCE || $topic_type == POST_ANNOUNCE )
  		{
  			$topic_type_toggle .= ' checked="checked"';
***************
*** 891,895 ****
  	if ( $topic_type_toggle != '' )
  	{
! 		$topic_type_toggle = $lang['Post_topic_as'] . ': <input type="radio" name="topictype" value="' . POST_NORMAL .'"' . ( ( $post_data['topic_type'] == POST_NORMAL ) ? ' checked="checked"' : '' ) . ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $topic_type_toggle;
  	}
  }
--- 891,895 ----
  	if ( $topic_type_toggle != '' )
  	{
! 		$topic_type_toggle = $lang['Post_topic_as'] . ': <input type="radio" name="topictype" value="' . POST_NORMAL .'"' . ( ( $post_data['topic_type'] == POST_NORMAL || $topic_type == POST_NORMAL ) ? ' checked="checked"' : '' ) . ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $topic_type_toggle;
  	}
  }
***************
*** 1083,1085 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 1083,1085 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file