[php-blog-cvs] serendipity NEWS,1.8,1.9 serendipity_functions.inc.php,1.125,1.126

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv17316

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
o Updated NEW
o Add Link to extended entry in RSS feed, if existing.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- NEWS	9 Aug 2003 00:57:49 -0000	1.8
+++ NEWS	11 Aug 2003 09:04:05 -0000	1.9
@@ -2,6 +2,8 @@
 
 Version 0.3 ()
 ------------------------------------
+    * Add Link to extended entry in RSS-feed, if existing (garvinhicking)
+    * Unified admin login functionality (tomsommer)
     * Fixed trackback functionality (tomsommer)
     * New config section ('Appearance') and new option to block certain hosts from being put into the referer table (garvinhicking)
     * Categories can now be folded in DHTML-compatible browsers for better overview (garvinhicking)

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- serendipity_functions.inc.php	10 Aug 2003 22:29:36 -0000	1.125
+++ serendipity_functions.inc.php	11 Aug 2003 09:04:05 -0000	1.126
@@ -884,6 +884,13 @@
                 // Display username as part of the title for easier feed-readability
                 $entry['title'] = $entry['username'] . ': ' . $entry['title'];
             }
+
+            // Embed a link to extended entry, if existing
+            if ($entry['exflag']) {
+                $ext = '<br /><a href="' . $guid . '#extended" title="' . VIEW_EXTENDED_ENTRY . '">' . VIEW_EXTENDED_ENTRY . '</a>';
+            } else {
+                $ext = '';
+            }
 ?>
 <item>
     <title><?php echo utf8_encode(htmlspecialchars($entry['title'])); ?></title>
@@ -901,7 +908,7 @@
     <comments><?php echo $guid; ?></comments>
     <author><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></author>
     <content:encoded>
-        <?php echo utf8_encode(htmlspecialchars(nl2br(serendipity_emoticate(serendipity_markup_text($entry['body']))))); ?>
+        <?php echo utf8_encode(htmlspecialchars(nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext))))); ?>
     </content:encoded>
     <pubDate><?php echo date('r', $entry['timestamp']); ?></pubDate>
     <guid><?php echo $guid; ?></guid>
@@ -909,7 +916,7 @@
             } else {
 ?>
     <description>
-        <?php echo utf8_encode(htmlspecialchars(nl2br($entry['body']))); ?>
+        <?php echo utf8_encode(htmlspecialchars(nl2br($entry['body'] . $ext))); ?>
     </description>
 <?php
             }