[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.33,1.34

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

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

Modified Files:
	sessions.php 
Log Message:
Various changes to location redirection ... please note the format and name changes

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** sessions.php	2001/10/14 15:48:18	1.33
--- sessions.php	2001/10/14 18:22:32	1.34
***************
*** 417,421 ****
  // code you must include this routine, even if it's empty.
  //
! function append_sid($url)
  {
  	global $SID;
--- 417,421 ----
  // code you must include this routine, even if it's empty.
  //
! function append_sid($url, $non_html_amp = false)
  {
  	global $SID;
***************
*** 423,428 ****
  	if(!empty($SID) && !eregi("sid=", $url))
  	{
! //		$url = ereg_replace("[&?]+$", "", $url);
! 		$url .= ( (strpos($url, "?") != false) ?  "&" : "?" ) . $SID;
  	}
  
--- 423,427 ----
  	if(!empty($SID) && !eregi("sid=", $url))
  	{
! 		$url .= ( (strpos($url, "?") != false) ?  ( ( $non_html_amp ) ? "&" : "&" ) : "?" ) . $SID;
  	}