Fix #14748: XML Parsing Error in print_all_bug_page_word.php

dregad · dregad · commit 65793390115b · 2012-09-27T02:07:31.000+02:00
When printing a bug with inline image attachments, an XML parsing error
was triggered due to lack of html encoding of the image's URL.
diff --git a/print_all_bug_page_word.php b/print_all_bug_page_word.php
@@ -473,13 +473,15 @@
 				}
 
 				$c_filename = string_display_line( $t_attachment['display_name'] );
-				$c_download_url = $t_path . htmlspecialchars( $t_attachment['download_url'] );
+				$c_download_url = htmlspecialchars( $t_attachment['download_url'] );
 				$c_filesize = number_format( $t_attachment['size'] );
 				$c_date_added = date( $t_date_format, $t_attachment['date_added'] );
-				echo "$c_filename ($c_filesize) <span class=\"italic\">$c_date_added</span><br />$c_download_url";
+				echo "$c_filename ($c_filesize " . lang_get( 'bytes' ) . ') '
+					. '<span class="italic-small">' . $c_date_added . '</span><br />'
+					. string_display_links( $t_path . $c_download_url );
 
 				if ( $t_attachment['preview'] && $t_attachment['type'] == 'image' && $f_type_page == 'html' ) {
-					echo '<br /><img src="', $t_attachment['download_url'], '" alt="', $t_attachment['alt'], '" /><br />';
+					echo '<br /><img src="', $c_download_url, '" alt="', $t_attachment['alt'], '" /><br />';
 				}
 			}
 		?>

Original file line number	Diff line number	Diff line change
`@@ -473,13 +473,15 @@`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`$c_filename = string_display_line( $t_attachment['display_name'] );`
`476`		`- $c_download_url = $t_path . htmlspecialchars( $t_attachment['download_url'] );`
	`476`	`+ $c_download_url = htmlspecialchars( $t_attachment['download_url'] );`
`477`	`477`	`$c_filesize = number_format( $t_attachment['size'] );`
`478`	`478`	`$c_date_added = date( $t_date_format, $t_attachment['date_added'] );`
`479`		`- echo "$c_filename ($c_filesize) <span class=\"italic\">$c_date_added</span><br />$c_download_url";`
	`479`	`+ echo "$c_filename ($c_filesize " . lang_get( 'bytes' ) . ') '`
	`480`	`+ . '<span class="italic-small">' . $c_date_added . '</span><br />'`
	`481`	`+ . string_display_links( $t_path . $c_download_url );`
`480`	`482`
`481`	`483`	`if ( $t_attachment['preview'] && $t_attachment['type'] == 'image' && $f_type_page == 'html' ) {`
`482`		`- echo '<br /><img src="', $t_attachment['download_url'], '" alt="', $t_attachment['alt'], '" /><br />';`
	`484`	`+ echo '<br /><img src="', $c_download_url, '" alt="', $t_attachment['alt'], '" /><br />';`
`483`	`485`	`}`
`484`	`486`	`}`
`485`	`487`	`?>`