[Phpbb-checkins] CVS: phpBB2 update_to_201.php,1.1.2.5,1.1.2.6

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

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

Modified Files:
      Tag: phpBB-2_0_0
	update_to_201.php 
Log Message:
oops, now that would've been a problematical oversight :D

Index: update_to_201.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/Attic/update_to_201.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** update_to_201.php	16 May 2002 12:32:00 -0000	1.1.2.5
--- update_to_201.php	18 May 2002 14:48:17 -0000	1.1.2.6
***************
*** 24,28 ****
  	global $db;
  
! 	if( !$db->sql_query($sql) )
  	{  
  		$errored = true;
--- 24,28 ----
  	global $db;
  
! 	if( !($result = $db->sql_query($sql)) )
  	{  
  		$errored = true;
***************
*** 37,41 ****
  	}
  
! 	return;
  }
  
--- 37,41 ----
  	}
  
! 	return $result;
  }
  
***************
*** 434,438 ****
  			FROM " . THEMES_TABLE . " 
  			WHERE template_name = 'subSilver'";
! 		_sql($sql, $errored, $error_ary);
  
  		if( $row = $db->sql_fetchrow($result) )
--- 434,438 ----
  			FROM " . THEMES_TABLE . " 
  			WHERE template_name = 'subSilver'";
! 		$result = _sql($sql, $errored, $error_ary);
  
  		if( $row = $db->sql_fetchrow($result) )
***************
*** 458,462 ****
  			GROUP BY topic_id
  			ORDER BY topic_id ASC";
! 		_sql($sql, $errored, $error_ary);
  
  		if ( $row = $db->sql_fetchrow($result) )
--- 458,462 ----
  			GROUP BY topic_id
  			ORDER BY topic_id ASC";
! 		$result = _sql($sql, $errored, $error_ary);
  
  		if ( $row = $db->sql_fetchrow($result) )
***************
*** 478,482 ****
  				AND u.user_id = ug.user_id 
  				AND u.user_level <> " . ADMIN;
! 		_sql($sql, $errored, $error_ary);
  
  		$mod_user = array();
--- 478,482 ----
  				AND u.user_id = ug.user_id 
  				AND u.user_level <> " . ADMIN;
! 		$result = _sql($sql, $errored, $error_ary);
  
  		$mod_user = array();
***************
*** 521,525 ****
  			$sql = "SELECT user_id, user_timezone_old 
  				FROM " . USERS_TABLE;
! 			_sql($sql, $errored, $error_ary);
  
  			while ( $row = $db->sql_fetchrow($result) )
--- 521,525 ----
  			$sql = "SELECT user_id, user_timezone_old 
  				FROM " . USERS_TABLE;
! 			$result = _sql($sql, $errored, $error_ary);
  
  			while ( $row = $db->sql_fetchrow($result) )
***************
*** 535,539 ****
  			FROM " . TOPICS_TABLE . " 
  			WHERE topic_moved_id <> 0";
! 		_sql($sql, $errored, $error_ary);
  
  		$topic_ary = array();
--- 535,539 ----
  			FROM " . TOPICS_TABLE . " 
  			WHERE topic_moved_id <> 0";
! 		$result = _sql($sql, $errored, $error_ary);
  
  		$topic_ary = array();
***************
*** 548,552 ****
  				FROM " . POSTS_TABLE . "
  				WHERE topic_id = $topic_moved_id";
! 			_sql($sql, $errored, $error_ary);
  
  			$sql = ( $row = $db->sql_fetchrow($result) ) ? "UPDATE " . TOPICS_TABLE . "	SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " WHERE topic_id = $topic_id" : "DELETE FROM " . TOPICS_TABLE . " WHERE topic_id = " . $row['topic_id'];
--- 548,552 ----
  				FROM " . POSTS_TABLE . "
  				WHERE topic_id = $topic_moved_id";
! 			$result = _sql($sql, $errored, $error_ary);
  
  			$sql = ( $row = $db->sql_fetchrow($result) ) ? "UPDATE " . TOPICS_TABLE . "	SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " WHERE topic_id = $topic_id" : "DELETE FROM " . TOPICS_TABLE . " WHERE topic_id = " . $row['topic_id'];