diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:41 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:41 +0100 |
| commit | 723e38ece20f7a7a3611b86a4feafeb28560ce02 (patch) | |
| tree | 705f26afa4b1ff84f830bec9545ab1b8e9479305 /phpBB/feed.php | |
| parent | 6ebc26e330d5e204eab0ac9061bb5817534047fe (diff) | |
| parent | 199bb1366018c61fe9c140d711369a92d576e757 (diff) | |
| download | forums-723e38ece20f7a7a3611b86a4feafeb28560ce02.tar forums-723e38ece20f7a7a3611b86a4feafeb28560ce02.tar.gz forums-723e38ece20f7a7a3611b86a4feafeb28560ce02.tar.bz2 forums-723e38ece20f7a7a3611b86a4feafeb28560ce02.tar.xz forums-723e38ece20f7a7a3611b86a4feafeb28560ce02.zip | |
Merge commit 'release-3.0.6-RC4'
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index 88539acbf1..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, ''); } /** @@ -430,7 +420,7 @@ class phpbb_feed /** * Default cache time of entries in seconds */ - var $cache_time = 300; + var $cache_time = 0; /** * Separator for title elements to separate items (for example forum / topic) |