[Phpbb-checkins] CVS: phpBB2 search.php,1.58,1.59

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

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

Modified Files:
	search.php 
Log Message:
Fix bug #502174, show Guest post usernames correctly ... well as correct as they currently are

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** search.php	2002/01/25 01:46:35	1.58
--- search.php	2002/01/25 02:34:49	1.59
***************
*** 760,764 ****
  			$forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $searchset[$i]['forum_id']);
  			$topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $searchset[$i]['topic_id'] . "&highlight=$highlight_active");
- 			$poster_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $searchset[$i]['user_id']);
  			$post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['post_id'] . "&highlight=$highlight_active#" . $searchset[$i]['post_id']);
  
--- 760,763 ----
***************
*** 840,843 ****
--- 839,846 ----
  				}
  
+ 				$poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $searchset[$i]['user_id']) . "\">" : "";
+ 				$poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != "" ) ? $searchset[$i]['post_username'] : $lang['Guest'] );
+ 				$poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? "</a>" : "";
+ 
  				if( $userdata['session_logged_in'] && $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
  				{
***************
*** 870,874 ****
  					"POST_SUBJECT" => $post_subject,
  					"POST_DATE" => $post_date,
! 					"POSTER_NAME" => $searchset[$i]['username'],
  					"TOPIC_REPLIES" => $searchset[$i]['topic_replies'],
  					"TOPIC_VIEWS" => $searchset[$i]['topic_views'],
--- 873,877 ----
  					"POST_SUBJECT" => $post_subject,
  					"POST_DATE" => $post_date,
! 					"POSTER_NAME" => $poster,
  					"TOPIC_REPLIES" => $searchset[$i]['topic_replies'],
  					"TOPIC_VIEWS" => $searchset[$i]['topic_views'],
***************
*** 879,884 ****
  					"U_POST" => $post_url,
  					"U_TOPIC" => $topic_url,
! 					"U_FORUM" => $forum_url,
! 					"U_USER_PROFILE" => $poster_url)
  				);
  			}
--- 882,886 ----
  					"U_POST" => $post_url,
  					"U_TOPIC" => $topic_url,
! 					"U_FORUM" => $forum_url)
  				);
  			}
***************
*** 1065,1069 ****
  				}
  
! 				$topic_poster = $searchset[$i]['username'];
  
  				$last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
--- 1067,1073 ----
  				}
  
! 				$topic_poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $searchset[$i]['user_id']) . "\">" : "";
! 				$topic_poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != "" ) ? $searchset[$i]['post_username'] : $lang['Guest'] );
! 				$topic_poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? "</a>" : "";
  
  				$last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
***************
*** 1071,1077 ****
  				$last_post_user = ( $searchset[$i]['id2'] == ANONYMOUS && $searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] : $searchset[$i]['user2'];
  
! 				$last_post = $last_post_time . "<br />" . $lang['by'] . " ";
! 				$last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $searchset[$i]['id2']) . "\">" . $last_post_user . "</a>&nbsp;";
! 				$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $searchset[$i]['topic_last_post_id']) . "#" . $searchset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
  
  				$template->assign_block_vars("searchresults", array( 
--- 1075,1081 ----
  				$last_post_user = ( $searchset[$i]['id2'] == ANONYMOUS && $searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] : $searchset[$i]['user2'];
  
! 				$last_post = $last_post_time . "<br />";
! 				$last_post .= ( $searchset[$i]['id2'] == ANONYMOUS ) ? ( ($searchset[$i]['post_username'] != "" ) ? $searchset[$i]['post_username'] . " " : $lang['Guest'] . " " ) : "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $searchset[$i]['id2']) . "\">" . $searchset[$i]['user2'] . "</a> ";
! 				$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $searchset[$i]['topic_last_post_id']) . "#" . $searchset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" alt=\"" . $lang['View_latest_post'] . "\" title=\"" . $lang['View_latest_post'] . "\" border=\"0\" /></a>";
  
  				$template->assign_block_vars("searchresults", array(