From: garvinhicking <garvinhicking>
Date: Wed, 25 Jan 2006 13:39:59 +0000 (+0000)
Subject: document changes, fix rss entrylink
X-Git-Tag: 1.0~142
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3a57e78946b75950c68e5c4c559b1a37b6435439;p=s9y.git

document changes, fix rss entrylink
---

diff --git a/docs/NEWS b/docs/NEWS
index 15d69f6..f4d429d 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,5 +1,37 @@
 # $Id$
 
+Version 1.0-beta2 ()
+------------------------------------------------------------------------
+
+   * Patch bundled PEAR.php so that it does not try to declare a PEAR
+     class a second time. (garvinhicking)
+
+   * RSS feeds use the permalink URL to link to extended entry, not the
+     RSS guid element. (garvinhicking)
+     
+   * Remove duplicate path file name in serendipity_currentURL function,
+     preventing the right "is frontpage?" detection routine from working.
+     (garvinhicking)
+   
+   * Use mysql_real_escape_string when available (garvinhicking)
+
+   * Atom feeds now use proper appliaction-mime type header, thanks to
+     Boris
+
+   * MoveableType importer no longer chokes on "FM/EM" timestamps
+     (garvinhicking)
+     
+   * Fix undefined function call to "is_defined".
+
+   * Added translation helper tool plugin_lang.php to detect untranslated
+     plugin constants (garvinhicking)
+
+   * Updated french translation by Sebastian Mordziol
+
+   * Updated icelandic translation by Örn Arnarson
+
+   * Updated chinese plugin translation, by Demin Yin
+
 Version 1.0-beta1 (January 23rd, 2006)
 ------------------------------------------------------------------------
 
diff --git a/include/functions_rss.inc.php b/include/functions_rss.inc.php
index 341feda..af17010 100644
--- a/include/functions_rss.inc.php
+++ b/include/functions_rss.inc.php
@@ -44,7 +44,7 @@ function serendipity_printEntries_rss(&$entries, $version, $comments = false, $f
                 $entry['body'] .= ' ' . $entry['extended'];
                 $ext = '';
             } elseif ($entry['exflag']) {
-                $ext = '<br /><a href="' . $entry['feed_guid'] . '#extended">' . sprintf(VIEW_EXTENDED_ENTRY, htmlspecialchars($entry['title'])) . '</a>';
+                $ext = '<br /><a href="' . $entry['feed_entryLink'] . '#extended">' . sprintf(VIEW_EXTENDED_ENTRY, htmlspecialchars($entry['title'])) . '</a>';
             } else {
                 $ext = '';
             }
diff --git a/rss.php b/rss.php
index 218319f..0733c6f 100644
--- a/rss.php
+++ b/rss.php
@@ -184,6 +184,8 @@ switch($version) {
         break;
 
     case 'atom1.0':
+        // For people wanting extra RFC compliance
+        // header('Content-Type: application/atom+xml; charset=utf8');
         $namespace_hook = 'frontend_display:atom-1.0:namespace';
         break;
 }
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index cb64137..cb35614 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -21,7 +21,7 @@ if (IS_installed === true && !defined('IN_serendipity')) {
 include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
 // The version string
-$serendipity['version']         = '1.0-beta1';
+$serendipity['version']         = '1.0-beta2';
 
 // Name of folder for the default theme
 $serendipity['defaultTemplate'] = 'default';