[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.69,1.70

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

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

Modified Files:
	functions.php 
Log Message:
Fixed preg single quote potential problem, altered jumpbox slightly

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** functions.php	2001/10/01 23:56:01	1.69
--- functions.php	2001/10/06 17:16:58	1.70
***************
*** 147,151 ****
  		$forum_rows = $db->sql_fetchrowset($q_forums);
  
! 		$boxstring = '<select name="' . POST_FORUM_URL . '"><option value="-1">' . $lang['Select_forum'] . '</option>';
  		for($i = 0; $i < $total_categories; $i++)
  		{ 
--- 147,151 ----
  		$forum_rows = $db->sql_fetchrowset($q_forums);
  
! 		$boxstring = '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $lang['Select_forum'] . '</option>';
  		for($i = 0; $i < $total_categories; $i++)
  		{ 
***************
*** 831,835 ****
  	for($i = 0; $i < count($smilies); $i++)
  	{
! 		$orig[] = "'(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)'i";
  		$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0">';
  	}
--- 831,835 ----
  	for($i = 0; $i < count($smilies); $i++)
  	{
! 		$orig[] = "/(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)/i";
  		$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0">';
  	}