|
From: Benjamin C. <bc...@us...> - 2004-09-07 13:26:42
|
Update of /cvsroot/phpbt/phpbt/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26376/templates/default Modified Files: Tag: htmltemplates bugdisplay.html Log Message: Fixes bug #1023541 - br tags from nl2br() getting clobbered by htmlspecialchars. Index: bugdisplay.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay.html,v retrieving revision 1.45.4.5 retrieving revision 1.45.4.6 diff -u -r1.45.4.5 -r1.45.4.6 --- bugdisplay.html 4 Sep 2004 20:39:57 -0000 1.45.4.5 +++ bugdisplay.html 7 Sep 2004 13:26:31 -0000 1.45.4.6 @@ -248,14 +248,14 @@ <td><?php echo translate("Posted by"); ?>: <?php echo maskemail($reporter); ?> <br> <?php echo translate("Date"); ?>: <?php echo date(TIME_FORMAT.' '.DATE_FORMAT, $created_date); ?></td> </tr><tr> - <td><?php echo stripslashes(htmlspecialchars(format_comments(nl2br($description)))); ?> <br><br></td> + <td><?php echo nl2br(stripslashes(htmlspecialchars(format_comments($description)))); ?> <br><br></td> </tr> <?php for ($i = 0, $ccount = count($comments); $i < $ccount; $i++) { ?> <tr class="alt"> <td><?php echo translate("Posted by"); ?>: <?php echo maskemail($comments[$i]['login']); ?> <br> <?php echo translate("Date"); ?>: <?php echo date(TIME_FORMAT.' '.DATE_FORMAT, $comments[$i]['created_date']); ?></td> </tr><tr> - <td><?php echo stripslashes(htmlspecialchars(format_comments(nl2br($comments[$i]['comment_text'])))); ?> <br><br></td> + <td><?php echo nl2br(stripslashes(htmlspecialchars(format_comments($comments[$i]['comment_text'])))); ?> <br><br></td> </tr> <?php } ?> </table> |