diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-12-08 01:53:26 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-12-08 01:53:26 +0000 |
| commit | 0fbea43f4b6456c87694c06a4a075f0ca006f395 (patch) | |
| tree | ecfb7e37affc1f601900026ae4d1fd6c350263ca | |
| parent | b5dcc21280bf925a9e420b40e6aabbd374687a68 (diff) | |
| download | forums-0fbea43f4b6456c87694c06a4a075f0ca006f395.tar forums-0fbea43f4b6456c87694c06a4a075f0ca006f395.tar.gz forums-0fbea43f4b6456c87694c06a4a075f0ca006f395.tar.bz2 forums-0fbea43f4b6456c87694c06a4a075f0ca006f395.tar.xz forums-0fbea43f4b6456c87694c06a4a075f0ca006f395.zip | |
Fix Bug #55005 - Correctly take post time instead of topic time for the overall forum feed statistics row.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10302 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/feed.php | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index fd19fe5972..ec91b5f09b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -104,6 +104,7 @@ <li>[Fix] PHP 5.3 compatibility: Check if function dl() exists before calling it. (Bug #54665)</li> <li>[Fix] PHP 5.3 compatibility: Disable E_DEPRECATED on startup to keep set_magic_quotes_runtime(0) quiet. (Bug #54495)</li> <li>[Fix] Correctly replace table prefix before inserting schema data into the database. (Bug #54815)</li> + <li>[Fix] Correctly take post time instead of topic time for the overall forum feed statistics row. (Bug #55005)</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/feed.php b/phpBB/feed.php index ec1f03092f..79848437c5 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -819,10 +819,8 @@ class phpbb_feed $user_link = ($row['user_id'] != ANONYMOUS) ? '<a href="' . feed_append_sid('/memberlist.' . $phpEx, 'mode=viewprofile&u=' . $row['user_id']) . '">' . $row['username'] . '</a>' : $row['username']; - $time = ($this->topic_id) ? $row['post_time'] : $row['topic_time']; - $item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $user_link - . ' ' . $this->separator_stats . ' ' . $user->format_date($time) + . ' ' . $this->separator_stats . ' ' . $user->format_date($row['post_time']) . ' ' . $this->separator_stats . ' ' . $user->lang['REPLIES'] . ' ' . $row['topic_replies'] . ' ' . $this->separator_stats . ' ' . $user->lang['VIEWS'] . ' ' . $row['topic_views']; } |