[Phpbb-checkins] CVS: phpBB2 login.php,1.43,1.44

[Doug K. <dou...@us...>]

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

Modified Files:
	login.php 
Log Message:
Here we have the pleasure of fixing bugs 526891 and 530830.  Both have been tested on my local copy, and they should be ready!


Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** login.php	18 Mar 2002 13:35:42 -0000	1.43
--- login.php	19 Mar 2002 15:39:05 -0000	1.44
***************
*** 98,105 ****
  
  					$template->assign_vars(array(
! 						"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?$redirect") . '">')
  					);
  
! 					$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?$redirect") . '">', '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  					message_die(GENERAL_MESSAGE, $message);
--- 98,105 ----
  
  					$template->assign_vars(array(
! 						"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
  					);
  
! 					$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?redirect=$redirect") . '">', '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  					message_die(GENERAL_MESSAGE, $message);
***************
*** 112,119 ****
  
  			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?$redirect") . '">')
  			);
  
! 			$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?$redirect") . '">', '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  			message_die(GENERAL_MESSAGE, $message);
--- 112,119 ----
  
  			$template->assign_vars(array(
! 				"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
  			);
  
! 			$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?redirect=$redirect") . '">', '</a>') . '<br /><br />' .  sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
  
  			message_die(GENERAL_MESSAGE, $message);
***************
*** 228,230 ****
  }
  
! ?>
\ No newline at end of file
--- 228,230 ----
  }
  
! ?>