[Phpbb-checkins] CVS: phpBB2 modcp.php,1.51,1.52

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

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

Modified Files:
	modcp.php 
Log Message:
Another \' update ...

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** modcp.php	2001/12/18 21:28:21	1.51
--- modcp.php	2001/12/21 22:39:23	1.52
***************
*** 524,528 ****
  						// Insert topic in the old forum that indicates that the forum has moved.
  						$sql = "INSERT INTO " . TOPICS_TABLE . " (forum_id, topic_title, topic_poster, topic_time, topic_status, topic_type, topic_vote, topic_views, topic_replies, topic_last_post_id, topic_moved_id)
! 							VALUES ($old_forum_id, '" . addslashes($row[$i]['topic_title']) . "', '" . $row[$i]['topic_poster'] . "', " . $row[$i]['topic_time'] . ", " . TOPIC_MOVED . ", " . POST_NORMAL . ", " . $row[$i]['topic_vote'] . ", " . $row[$i]['topic_views'] . ", " . $row[$i]['topic_replies'] . ", " . $row[$i]['topic_last_post_id'] . ", $topic_id)";
  						if( !$result = $db->sql_query($sql) )
  						{
--- 524,528 ----
  						// Insert topic in the old forum that indicates that the forum has moved.
  						$sql = "INSERT INTO " . TOPICS_TABLE . " (forum_id, topic_title, topic_poster, topic_time, topic_status, topic_type, topic_vote, topic_views, topic_replies, topic_last_post_id, topic_moved_id)
! 							VALUES ($old_forum_id, '" . addslashes(str_replace("\'", "''", $row[$i]['topic_title'])) . "', '" . str_replace("\'", "''", $row[$i]['topic_poster']) . "', " . $row[$i]['topic_time'] . ", " . TOPIC_MOVED . ", " . POST_NORMAL . ", " . $row[$i]['topic_vote'] . ", " . $row[$i]['topic_views'] . ", " . $row[$i]['topic_replies'] . ", " . $row[$i]['topic_last_post_id'] . ", $topic_id)";
  						if( !$result = $db->sql_query($sql) )
  						{
***************
*** 726,730 ****
  
  			$post_rowset = $db->sql_fetchrow($result);
! 			$first_poster = $post_rowset['poster_id'];
  			$topic_id = $post_rowset['topic_id'];
  			$post_time = $post_rowset['post_time'];
--- 726,730 ----
  
  			$post_rowset = $db->sql_fetchrow($result);
! 			$first_poster = str_replace("\'", "''", $post_rowset['poster_id']);
  			$topic_id = $post_rowset['topic_id'];
  			$post_time = $post_rowset['post_time'];
***************
*** 741,745 ****
  			$sql  = "INSERT INTO " . TOPICS_TABLE . "
  				(topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type)
! 				VALUES ('$post_subject', $first_poster, " . $topic_time . ", $new_forum_id, " . TOPIC_UNLOCKED . ", " . POST_NORMAL . ")";
  			if(!$result = $db->sql_query($sql, BEGIN_TRANSACTION))
  			{
--- 741,745 ----
  			$sql  = "INSERT INTO " . TOPICS_TABLE . "
  				(topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type)
! 				VALUES ('" . str_replace("\'", "''", $post_subject) . "', $first_poster, " . $topic_time . ", $new_forum_id, " . TOPIC_UNLOCKED . ", " . POST_NORMAL . ")";
  			if(!$result = $db->sql_query($sql, BEGIN_TRANSACTION))
  			{
***************
*** 1175,1177 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
--- 1175,1177 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file