From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 17 Nov 2005 00:17:30 +0000 (+0000)
Subject: * (bug 3999) Change atom 1.0 feed id; had been unnecessarily complex due to
X-Git-Tag: 1.6.0~1160
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=1723dee5ae699dba6b6df863cbfd21d87e2630ef;p=lhc%2Fweb%2Fwiklou.git

* (bug 3999) Change atom 1.0 feed id; had been unnecessarily complex due to
  unclear language in the spec. Now using the URL, same as the permalink,
  which someone else will probably whine about because it's not 'perma'
  enough or something.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 576ffdccd3..4925227525 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -235,6 +235,10 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 1984) LanguageKo.php (Korean) update
 * (bug 3804) update of LanguageWa.php file
 * Recognize Special:Search consistently so read whitelist works
+* (bug 3999) Change atom 1.0 feed id; had been unnecessarily complex due to
+  unclear language in the spec. Now using the URL, same as the permalink,
+  which someone else will probably whine about because it's not 'perma'
+  enough or something.
 
 
 === Caveats ===
diff --git a/includes/Feed.php b/includes/Feed.php
index 0f5febd61a..f8a07846e1 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -254,14 +254,15 @@ class AtomFeed extends ChannelFeed {
 	
 	/**
 	 * Atom 1.0 requires a unique, opaque IRI as a unique indentifier
-	 * for every feed we create.
+	 * for every feed we create. For now just use the URL, but who
+	 * can tell if that's right? If we put options on the feed, do we
+	 * have to change the id? Maybe? Maybe not.
+	 *
 	 * @return string
 	 * @access private
 	 */
 	function getFeedId() {
-		global $wgServer, $wgScript;
-		return htmlspecialchars( "$wgServer$wgScript?atom-feed-id/" .
-			wfTimestamp( TS_MW ) . "/" . wfRandom() );
+		return $this->getSelfUrl();
 	}
 	
 	/**