[geeklog-cvs] geeklog-1.3/public_html article.php,1.33,1.34

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv13422

Modified Files:
	article.php 
Log Message:
For the "printer-friendly version", don't apply nl2br() to HTML posts (bug #762636).


Index: article.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/article.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** article.php	24 Jun 2003 19:08:58 -0000	1.33
--- article.php	1 Jul 2003 15:03:44 -0000	1.34
***************
*** 102,107 ****
                  $story_template->set_var('story_author', DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"));
              }
!             $story_template->set_var('story_introtext',nl2br(stripslashes($A['introtext'])));
!             $story_template->set_var('story_bodytext', nl2br(stripslashes($A['bodytext'])));
              $story_template->set_var('site_url',$_CONF['site_url']);
              $story_template->set_var('layout_url',$_CONF['layout_url']);
--- 102,116 ----
                  $story_template->set_var('story_author', DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"));
              }
!             if ($A['postmode'] == 'html') {
!                 $story_template->set_var ('story_introtext',
!                         stripslashes ($A['introtext']));
!                 $story_template->set_var ('story_bodytext',
!                         stripslashes ($A['bodytext']));
!             } else {
!                 $story_template->set_var ('story_introtext',
!                         nl2br (stripslashes ($A['introtext'])));
!                 $story_template->set_var ('story_bodytext',
!                         nl2br (stripslashes ($A['bodytext'])));
!             }
              $story_template->set_var('site_url',$_CONF['site_url']);
              $story_template->set_var('layout_url',$_CONF['layout_url']);