* fix missing rss1.0 namespace

* fix autodetection using ports if not :80.

diff --git a/docs/NEWS b/docs/NEWS
index 382c29dc99e152934f7249bb6366c6973b3dc5b9..7c530a5920d449cfb041a1764431e8b29a4cb332 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,8 @@
 Version 0.9 ()
 ------------------------------------------------------------------------
 
+    * Fix RSS 1.0 missing top-level namespace (garvinhicking)
+    
     * Added new event hook to the trackback sending facility so that
       plugins like serendipity_event_trackback (additional_plugins)
       can send trackbacks to Blogs without RDF-metadata (garvinhicking)

diff --git a/rss.php b/rss.php
index 26301cab0bbe783729f0ad58e0bbbf63580e8e53..d20f909b49ff573d6a4a53d9a971c769f7d2ef3a 100644 (file)
--- a/rss.php
+++ b/rss.php
@@ -155,8 +155,9 @@ case '1.0':
    xmlns:content="http://purl.org/rss/1.0/modules/content/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
-   xmlns:wfw="http://wellformedweb.org/CommentAPI/">
-<channel rdf:about="{$serendipity['baseURL']}rss.php?version=1.0">
+   xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+   xmlns="http://my.netscape.com/rdf/simple/0.9/">
+<channel>
     <title>$title</title>
     <link>{$serendipity['baseURL']}</link>
     <description>$description</description>

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 5049241e4ebdf5bf56fae452eff12ede4feaa9ca..6b3242d774f5b3063be14639996edc3441e7e6c3 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -261,7 +261,7 @@ $serendipity['permissionLevels'] = array(USERLEVEL_EDITOR => USERLEVEL_EDITOR_DE
 
 if ( (isset($serendipity['autodetect_baseURL']) && serendipity_db_bool($serendipity['autodetect_baseURL'])) ||
      (isset($serendipity['embed']) && serendipity_db_bool($serendipity['embed'])) ) {
-    $serendipity['baseURL'] = 'http' . (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'];
+    $serendipity['baseURL'] = 'http' . (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '') . $serendipity['serendipityHTTPPath'];
 }
 
 /*