diff options
author | Andreas Fischer <bantu@phpbb.com> | 2009-11-30 00:06:15 +0000 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2009-11-30 00:06:15 +0000 |
commit | cf9e42ffd88aa76c559a43f9a68f736a2367b9cf (patch) | |
tree | 32cc5acc4c900c1d3f014dbc59f60a30ad4802e9 | |
parent | edc475b83f6121dd78ff1c84d1ce66697757da36 (diff) | |
download | forums-cf9e42ffd88aa76c559a43f9a68f736a2367b9cf.tar forums-cf9e42ffd88aa76c559a43f9a68f736a2367b9cf.tar.gz forums-cf9e42ffd88aa76c559a43f9a68f736a2367b9cf.tar.bz2 forums-cf9e42ffd88aa76c559a43f9a68f736a2367b9cf.tar.xz forums-cf9e42ffd88aa76c559a43f9a68f736a2367b9cf.zip |
Fix Bug #53025 - Correctly show topic ATOM feed link when only post id is specified.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10295 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
-rw-r--r-- | phpBB/viewtopic.php | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 99c93a0af7..b176cc15d1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -99,6 +99,7 @@ <li>[Fix] Make word censoring case insensitive. (Bug #54265)</li> <li>[Fix] Fulltext-MySQL search for keywords and username at the same time. (Bug #54325)</li> <li>[Fix] Various XHTML mistakes in prosilver. (Bug #54705)</li> + <li>[Fix] Correctly show topic ATOM feed link when only post id is specified. (Bug #53025)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> <li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li> </ul> diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 7fb954017d..a114940449 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1726,6 +1726,12 @@ if (empty($_REQUEST['f'])) $_REQUEST['f'] = $forum_id; } +// We need to do the same with the topic_id. See #53025. +if (empty($_REQUEST['t']) && !empty($topic_id)) +{ + $_REQUEST['t'] = $topic_id; +} + // Output the page page_header($user->lang['VIEW_TOPIC'] . ' - ' . $topic_data['topic_title'], true, $forum_id); |