Fixes #10947: Entries in RSS feed show theusername@example.com + a PH…

…P error fix.
mantisbt · Oct 31, 2009 · 72c6185 · 72c6185
1 parent 06c9ea2
commit 72c6185
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/issues_rss.php b/issues_rss.php
@@ -174,7 +174,7 @@
 		$about = $link = $t_path . "view.php?id=" . $t_bug->id;
 		$title = string_rss_links( bug_format_id( $t_bug->id ) . ': ' . $t_bug->summary );
 
-		if ( $row['view_state'] == VS_PRIVATE ) {
+		if ( $t_bug->view_state == VS_PRIVATE ) {
 			$title .= ' [' . lang_get( 'private' ) . ']';
 		}
 
@@ -187,16 +187,19 @@
 		$date = $t_bug->last_updated;
 
 		# author of item
-		$author = string_rss_links( user_get_name( $t_bug->reporter_id ) );
+		$author = '';
 		if ( access_has_global_level( config_get( 'show_user_email_threshold' ) ) ) {
+			$t_author_name = string_rss_links( user_get_name( $t_bug->reporter_id ) );
 			$t_author_email = user_get_field( $t_bug->reporter_id, 'email' );
-			if ( is_blank( $t_author_email ) ) {
-				$t_author_email = $author . '@example.com';
+
+			if ( !is_blank( $t_author_email ) ) {
+				if ( !is_blank( $t_author_name ) ) {
+					$author = $t_author_name . ' &lt;' . $t_author_email . '&gt;';
+				} else {
+					$author = $t_author_email;
+				}
 			}
-		} else {
-			$t_author_email = $author . '@example.com';
 		}
-		$author .= ' &lt;' . $t_author_email . '&gt;';
 
 		# $comments = 'http://www.example.com/sometext.php?somevariable=somevalue&comments=1';	# url to comment page rss 2.0 value
 		$comments = $t_path . 'view.php?id=' . $t_bug->id . '#bugnotes';

diff --git a/news_rss.php b/news_rss.php
@@ -141,11 +141,17 @@
 		$date = $v_date_posted;
 
 		# author of item
-		$author = string_rss_links( user_get_name( $v_poster_id ) );
+		$author = '';
 		if ( access_has_global_level( config_get( 'show_user_email_threshold' ) ) ) {
+			$t_author_name = string_rss_links( user_get_name( $v_poster_id ) );
 			$t_author_email = user_get_field( $v_poster_id, 'email' );
-			if ( ! is_blank( $t_author_email ) ) {
-				$author .= ' &lt;' . $t_author_email . '&gt;';
+
+			if ( !is_blank( $t_author_email ) ) {
+				if ( !is_blank( $t_author_name ) ) {
+					$author = $t_author_name . ' &lt;' . $t_author_email . '&gt;';
+				} else {
+					$author = $t_author_email;
+				}
 			}
 		}