[mxbb-commits] core/includes mx_functions_phpbb.php,1.69,1.70

[FlorinCB <ory...@us...>]

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

Modified Files:
	mx_functions_phpbb.php 
Log Message:
user-> mx_user->

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** mx_functions_phpbb.php	5 Jul 2008 22:19:58 -0000	1.69
--- mx_functions_phpbb.php	8 Jul 2008 22:01:34 -0000	1.70
***************
*** 1567,1571 ****
  function mx_get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
  {
! 	global $phpbb_root_path, $phpEx, $user, $phpbb_auth;
  
  	$profile_url = '';
--- 1567,1571 ----
  function mx_get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
  {
! 	global $phpbb_root_path, $phpEx, $mx_user, $phpbb_auth;
  
  	$profile_url = '';
***************
*** 1574,1582 ****
  	if ($guest_username === false)
  	{
! 		$username = ($username) ? $username : $user->lang['GUEST'];
  	}
  	else
  	{
! 		$username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $user->lang['GUEST']);
  	}
  
--- 1574,1582 ----
  	if ($guest_username === false)
  	{
! 		$username = ($username) ? $username : $mx_user->lang['GUEST'];
  	}
  	else
  	{
! 		$username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $mx_user->lang['GUEST']);
  	}
  
***************
*** 1586,1590 ****
  		// Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly).
  		// For all others the link leads to a login page or the profile.
! 		if ($user->data['user_id'] != ANONYMOUS && !$phpbb_auth->acl_get('u_viewprofile'))
  		{
  			$profile_url = '';
--- 1586,1590 ----
  		// Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly).
  		// For all others the link leads to a login page or the profile.
! 		if ($mx_user->data['user_id'] != ANONYMOUS && !$phpbb_auth->acl_get('u_viewprofile'))
  		{
  			$profile_url = '';