[mxbb-commits] core/includes/shared/phpbb2/includes functions.php, 1.1, 1.2

[Jon O. <jon...@us...>]

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

Modified Files:
	functions.php 
Log Message:
topics_per_page not defined in internal mode
i'm defaulting to 15 for now

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** functions.php	9 Sep 2007 16:51:51 -0000	1.1
--- functions.php	14 Jun 2008 19:17:28 -0000	1.2
***************
*** 85,89 ****
  {
  	$username = substr(htmlspecialchars(str_replace("\'", "'", trim($username))), 0, 25);
! 	$username = self::phpbb_rtrim($username, "\\");
  	$username = str_replace("'", "\'", $username);
  
--- 85,90 ----
  {
  	$username = substr(htmlspecialchars(str_replace("\'", "'", trim($username))), 0, 25);
! 	//$username = self::phpbb_rtrim($username, "\\");
! 	$username = phpBB2::phpbb_rtrim($username, "\\"); // php4
  	$username = str_replace("'", "\'", $username);
  
***************
*** 186,190 ****
  	if (!is_numeric($user) || $force_str)
  	{
! 		$user = self::phpbb_clean_username($user);
  	}
  	else
--- 187,192 ----
  	if (!is_numeric($user) || $force_str)
  	{
! 		//$user = self::phpbb_clean_username($user);
! 		$user = phpBB2::phpbb_clean_username($user); // php4
  	}
  	else