[mxbb-commits] core/includes/shared/phpbb3/includes functions_hook.php, 1.16, 1.17

[Culprit <cul...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15417/core/includes/shared/phpbb3/includes

Modified Files:
	functions_hook.php 
Log Message:
convert link SID fix

Index: functions_hook.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** functions_hook.php	18 Jun 2008 12:14:14 -0000	1.16
--- functions_hook.php	18 Jun 2008 17:00:55 -0000	1.17
***************
*** 228,239 ****
  		$match_link_cnt = preg_match_all( '#(action|href)=[\'"](([^?\'"]*)\??([^\'"]*)?)[\'"]#si', $html, $match_link);
  
! 		if( 0)
! 		{
! 			print '<pre>';
! 			print htmlentities( trim($html));
! 			print_r( $match_link);
! 			die();
! 		}
! 				$preg_array = array( '##si' => '');
  		$do_not_convert_ary = array( "{$phpbb_root_path}memberlist");
  		$do_not_convert = "(" . implode( "|", $do_not_convert_ary) . ")";
--- 228,232 ----
  		$match_link_cnt = preg_match_all( '#(action|href)=[\'"](([^?\'"]*)\??([^\'"]*)?)[\'"]#si', $html, $match_link);
  
! 		$preg_array = array( '##si' => '');
  		$do_not_convert_ary = array( "{$phpbb_root_path}memberlist");
  		$do_not_convert = "(" . implode( "|", $do_not_convert_ary) . ")";
***************
*** 262,265 ****
--- 255,259 ----
  			$link_orig = preg_replace( '#([./\[\]\(\)?\\\\])#si', "\\\\\\1", $match_link[2][$i]);
  			$link_orig = str_replace( '#', '\#', $link_orig);
+ 			$link = str_replace( 'sid=sid=', 'sid=', $link);
  			if ( !empty($link_orig) && !( eregi($do_not_convert, $link_orig)) )
  			{
***************
*** 267,271 ****
  			}
  		}
! 		//return $html;
  		if( 0)
  		{
--- 261,265 ----
  			}
  		}
! 
  		if( 0)
  		{