xoops-cvs2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2
In directory sc8-pr-cvs1:/tmp/cvs-serv12120

Modified Files:
	userinfo.php 
Log Message:
fix for bug 314

Index: userinfo.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/userinfo.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** userinfo.php	2 Jan 2003 14:56:45 -0000	1.1
--- userinfo.php	4 Jan 2003 14:54:58 -0000	1.2
***************
*** 36,40 ****
  }
  
! if ( $xoopsUser ) {
  	if ($uid == $xoopsUser->getVar('uid')) {
  		$config_handler =& xoops_gethandler('config');
--- 36,40 ----
  }
  
! if (is_object($xoopsUser)) {
  	if ($uid == $xoopsUser->getVar('uid')) {
  		$config_handler =& xoops_gethandler('config');
***************
*** 81,85 ****
  $myts =& MyTextSanitizer::getInstance();
  if ($thisUser->isActive()) {
! 	if ($xoopsUser->isAdmin()) {
  		$xoopsTpl->assign('lang_editprofile', _US_EDITPROFILE);	
  		$xoopsTpl->assign('lang_deleteaccount', _US_DELACCOUNT);
--- 81,85 ----
  $myts =& MyTextSanitizer::getInstance();
  if ($thisUser->isActive()) {
! 	if (is_object($xoopsUser) && $xoopsUser->isAdmin()) {
  		$xoopsTpl->assign('lang_editprofile', _US_EDITPROFILE);	
  		$xoopsTpl->assign('lang_deleteaccount', _US_DELACCOUNT);
***************
*** 129,133 ****
  		$xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
  	} else {
! 		if ($xoopsUser) {
  			if ($xoopsUser->isAdmin() || ($xoopsUser->getVar("uid") == $thisUser->getVar("uid"))) {
  				$xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
--- 129,133 ----
  		$xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
  	} else {
! 		if (is_object($xoopsUser)) {
  			if ($xoopsUser->isAdmin() || ($xoopsUser->getVar("uid") == $thisUser->getVar("uid"))) {
  				$xoopsTpl->assign('user_email', $thisUser->getVar('email', 'E'));
***************
*** 139,143 ****
  		}
  	}
! 	if ($xoopsUser) {
  		$xoopsTpl->assign('user_pmlink', "<a href=\"javascript:openWithSelfMain('".XOOPS_URL."/pmlite.php?send2=1&amp;to_userid=".$thisUser->getVar('uid')."', 'pmlite', 360, 290);\"><img src=\"".XOOPS_URL."/images/icons/pm.gif\" alt=\"".sprintf(_SENDPMTO,$thisUser->getVar('uname'))."\" /></a>");
  	} else {
--- 139,143 ----
  		}
  	}
! 	if (is_object($xoopsUser)) {
  		$xoopsTpl->assign('user_pmlink', "<a href=\"javascript:openWithSelfMain('".XOOPS_URL."/pmlite.php?send2=1&amp;to_userid=".$thisUser->getVar('uid')."', 'pmlite', 360, 290);\"><img src=\"".XOOPS_URL."/images/icons/pm.gif\" alt=\"".sprintf(_SENDPMTO,$thisUser->getVar('uname'))."\" /></a>");
  	} else {