From 2258d856235b29222ee82c17d9f6490c8dc7284c Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 29 Oct 2009 14:00:43 +0000
Subject: Implement suggestion in ticket #52155 - Better way to generate
 SID-free links in feed.php

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

diff --git a/phpBB/feed.php b/phpBB/feed.php
index 263f6f9272..b9d6e1959a 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -212,17 +212,7 @@ function feed_append_sid($url, $params)
 {
 	global $board_url;
 
-	$link = append_sid($board_url . $url, $params);
-
-	// Remove added sid - not as easy as it sounds. ;)
-	$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;
-	$link = (substr($link, -5) === '&amp;') ? substr($link, 0, -5) : $link;
-	// And &amp;#xxx
-	$link = str_replace('&amp;#', '#', $link);
-
-	return $link;
+	return append_sid($board_url . $url, $params, true, '');
 }
 
 /**
-- 
cgit v1.2.1