diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-07-27 10:46:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-07-27 10:46:56 +0000 |
| commit | 4066849b726b279923d0518c4754f21b464186a4 (patch) | |
| tree | f0a62ce801b8af890d06fd2ae392ba75ae9d6373 /phpBB/feed.php | |
| parent | 3d8d213e8f57a9387b090c858fb831036b264ade (diff) | |
| download | forums-4066849b726b279923d0518c4754f21b464186a4.tar forums-4066849b726b279923d0518c4754f21b464186a4.tar.gz forums-4066849b726b279923d0518c4754f21b464186a4.tar.bz2 forums-4066849b726b279923d0518c4754f21b464186a4.tar.xz forums-4066849b726b279923d0518c4754f21b464186a4.zip | |
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
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 7 |
1 files 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('/(&|&|\?)sid=[a-z0-9]+(&|&)?/', '\1', $link), '?& ') : $link; // Now the only thing remaining could be an empty & - if (substr($link, -5) === '&') - { - $link = substr($link, 0, -5); - } + $link = (substr($link, -5) === '&') ? substr($link, 0, -5) : $link; + // And &#xxx + $link = str_replace('&#', '#', $link); return $link; } |