[Phpbb-checkins] CVS: phpBB2 install.php,1.23,1.24

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

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

Modified Files:
	install.php 
Log Message:
More \' to '' changes

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** install.php	2001/12/20 19:24:30	1.23
--- install.php	2001/12/21 15:52:14	1.24
***************
*** 368,377 ****
  	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
  
- 	$template->assign_block_vars("switch_ftp_file", array());
- 	$template->assign_block_vars("switch_common_install", array());
  	if( $upgrade == 1 )
  	{
  		$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
  	}
  	$template->assign_vars(array(
  		"L_INSTRUCTION_TEXT" => $lang['ftp_instructs'],
--- 368,379 ----
  	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
  
  	if( $upgrade == 1 )
  	{
  		$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
  	}
+ 
+ 	$template->assign_block_vars("switch_ftp_file", array());
+ 	$template->assign_block_vars("switch_common_install", array());
+ 
  	$template->assign_vars(array(
  		"L_INSTRUCTION_TEXT" => $lang['ftp_instructs'],
***************
*** 713,717 ****
  
  			$sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) 
! 				VALUES ('default_lang', '$language')";
  			$result = $db->sql_query($sql);
  			if( !$result )
--- 715,719 ----
  
  			$sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) 
! 				VALUES ('default_lang', '" . str_replace("\'", "''", $language) . "')";
  			$result = $db->sql_query($sql);
  			if( !$result )
***************
*** 723,727 ****
  
  			$sql = "UPDATE " . $table_prefix . "users 
! 				SET username = '$admin_name', user_password='$admin_pass_md5', user_lang = '" . $language . "' 
  				WHERE username = 'Admin'";
  			$result = $db->sql_query($sql);
--- 725,729 ----
  
  			$sql = "UPDATE " . $table_prefix . "users 
! 				SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "' 
  				WHERE username = 'Admin'";
  			$result = $db->sql_query($sql);
***************
*** 907,909 ****
  }
  
! ?>
--- 909,911 ----
  }
  
! ?>
\ No newline at end of file