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('/(&|&|\?)sid=[a-z0-9]+(&|&)?/', '\1', $link), '?& ') : $link; - - // Now the only thing remaining could be an empty & - $link = (substr($link, -5) === '&') ? substr($link, 0, -5) : $link; - // And &#xxx - $link = str_replace('&#', '#', $link); - - return $link; + return append_sid($board_url . $url, $params, true, ''); } /**