--- pukiwiki/pukiwiki/plugin/rss10.inc.php	2003/06/06 08:08:14	1.6
+++ pukiwiki/pukiwiki/plugin/rss10.inc.php	2004/02/29 07:43:21	1.10
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: rss10.inc.php,v 1.6 2003/06/06 08:08:14 arino Exp $
+// $Id: rss10.inc.php,v 1.10 2004/02/29 07:43:21 arino Exp $
 //
 // RecentChanges ¤Î RSS ¤ò½ÐÎÏ
 function plugin_rss10_action()
@@ -10,7 +10,11 @@
 	global $script,$rss_max,$page_title,$whatsnew;
 	global $trackback;
 	
-	$self = $script.'?';
+	$self = (preg_match('#^https?://#',$script) ? $script : get_script_uri());
+	if ($self === FALSE)
+	{
+		die_message("please set '\$script' in ".INI_FILE);
+	}
 	
 	$page_title_utf8 = mb_convert_encoding($page_title,'UTF-8',SOURCE_ENCODING);
 	
@@ -37,20 +41,20 @@
 		if ($trackback)
 		{
 			$tb_id = md5($r_page);
-			$dc_identifier = " <dc:identifer>$script?$r_page</dc:identifer>";
-			$trackback_ping = " <trackback:ping>$script?plugin=tb&amp;tb_id=$tb_id</trackback:ping>";
+			$dc_identifier = " <dc:identifier>$self?$r_page</dc:identifier>";
+			$trackback_ping = " <trackback:ping>$self?plugin=tb&amp;tb_id=$tb_id</trackback:ping>";
 		}
 		$items .= <<<EOD
-<item rdf:about="$script?$r_page">
+<item rdf:about="$self?$r_page">
  <title>$title</title>
- <link>$script?$r_page</link>
+ <link>$self?$r_page</link>
  <dc:date>$dc_date</dc:date>
 $dc_identifier
 $trackback_ping
 </item>
 
 EOD;
-		$rdf_li .= "    <rdf:li rdf:resource=\"$script?$r_page\" />\n";
+		$rdf_li .= "    <rdf:li rdf:resource=\"$self?$r_page\" />\n";
 	}
 	
 	$xmlns_trackback = $trackback ?  
@@ -68,9 +72,9 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
   xml:lang="ja">
 
- <channel rdf:about="$script?rss">
+ <channel rdf:about="$self?$whatsnew">
   <title>$page_title_utf8</title>
-  <link>$script?$whatsnew</link>
+  <link>$self?$whatsnew</link>
   <description>PukiWiki RecentChanges</description>
   <items>
    <rdf:Seq>