From 4066849b726b279923d0518c4754f21b464186a4 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 27 Jul 2009 10:46:56 +0000
Subject: [PATCH] i hope this resolves the duplicate issues in feed readers

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9868 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/feed.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/phpBB/feed.php b/phpBB/feed.php
index 5f19d0161b..a84cc81940 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -218,10 +218,9 @@ function feed_append_sid($url, $params)
 	$link = (strpos($link, 'sid=') !== false) ? trim(preg_replace('/(&amp;|&|\?)sid=[a-z0-9]+(&amp;|&)?/', '\1', $link), '?& ') : $link;
 
 	// Now the only thing remaining could be an empty &amp;
-	if (substr($link, -5) === '&amp;')
-	{
-		$link = substr($link, 0, -5);
-	}
+	$link = (substr($link, -5) === '&amp;') ? substr($link, 0, -5) : $link;
+	// And &amp;#xxx
+	$link = str_replace('&amp;#', '#', $link);
 
 	return $link;
 }