document changes, fix rss entrylink

diff --git a/docs/NEWS b/docs/NEWS
index 15d69f6ec66d9bd9428a3ff1d2f1890db0e58956..f4d429db27d37ada7fa78bc33367179c25089ce6 100644 (file)
--- 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 341fedaa0c4d825ce1d78a03709fcbdb7309282a..af1701018b89a808c05c3cc6167b17942debb71c 100644 (file)
--- 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 218319fb178d24670060841f1f3f4a648bf71ec7..0733c6f9383b03a4694d1da2477d3492edd81b64 100644 (file)
--- 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 cb641379fe5180a5968d7c472cc759ae25b4cfc2..cb35614a9f04562c0679fe2b6e0ea2c86d6c6374 100644 (file)
--- 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';