diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-29 14:00:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-29 14:00:43 +0000 |
| commit | 2258d856235b29222ee82c17d9f6490c8dc7284c (patch) | |
| tree | 367407fc31a16beda24b649e22137c287558577b /phpBB/feed.php | |
| parent | 3d3e673396ea95f401aa5a1460e1a7dbbef1100a (diff) | |
| download | forums-2258d856235b29222ee82c17d9f6490c8dc7284c.tar forums-2258d856235b29222ee82c17d9f6490c8dc7284c.tar.gz forums-2258d856235b29222ee82c17d9f6490c8dc7284c.tar.bz2 forums-2258d856235b29222ee82c17d9f6490c8dc7284c.tar.xz forums-2258d856235b29222ee82c17d9f6490c8dc7284c.zip | |
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
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 12 |
1 files changed, 1 insertions, 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('/(&|&|\?)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, ''); } /** |