From 37d4af61aec66620b10ca3bbf9a7062bedc6c5f4 Mon Sep 17 00:00:00 2001
From: garvinhicking <garvinhicking>
Date: Wed, 4 May 2005 16:37:54 +0000
Subject: [PATCH] * fix missing rss1.0 namespace * fix autodetection using
 ports if not :80.

---
 docs/NEWS                  | 2 ++
 rss.php                    | 5 +++--
 serendipity_config.inc.php | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index 382c29d..7c530a5 100644
--- 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 26301ca..d20f909 100644
--- 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 5049241..6b3242d 100644
--- 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'];
 }
 
 /*
-- 
2.39.5