[geeklog-cvs] Geeklog-1.x/system lib-syndication.php,1.40,1.41

[Michael Jervis]

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv36096/system

Modified Files:
	lib-syndication.php 
Log Message:
#662 - Plaintext stories need nl2br in syndication feeds. - bru_man

Index: lib-syndication.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-syndication.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** lib-syndication.php	17 Feb 2008 15:02:36 -0000	1.40
--- lib-syndication.php	26 Jun 2008 21:16:00 -0000	1.41
***************
*** 267,270 ****
--- 267,282 ----
              $fulltext = trim( $fulltext );
              $fulltext = preg_replace( "/(\015)/", "", $fulltext );
+             
+             if( $row['postmode'] == 'plaintext' ) 
+             {
+                 if( !empty($storytext) )
+                 {
+                     $storytext = nl2br($storytext);
+                 }
+                 if( !empty($fulltext) )
+                 {
+                     $fulltext = nl2br($fulltext);
+                 }
+             }
  
              $storylink = COM_buildUrl( $_CONF['site_url']
***************
*** 374,378 ****
          $fulltext = trim( $fulltext );
          $fulltext = preg_replace( "/(\015)/", "", $fulltext );
! 
          $storylink = COM_buildUrl( $_CONF['site_url'] . '/article.php?story='
                                     . $row['sid'] );
--- 386,402 ----
          $fulltext = trim( $fulltext );
          $fulltext = preg_replace( "/(\015)/", "", $fulltext );
!         
!         if( $row['postmode'] == 'plaintext' ) 
!         {
!             if( !empty($storytext) )
!             {
!                 $storytext = nl2br($storytext);
!             }
!             if( !empty($fulltext) )
!             {
!                 $fulltext = nl2br($fulltext);
!             }
!         }
!         
          $storylink = COM_buildUrl( $_CONF['site_url'] . '/article.php?story='
                                     . $row['sid'] );