diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-06 17:00:09 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-06 17:00:09 +0000 |
| commit | 12a9e001837da139a9ea07b8dd52019ee071d9bd (patch) | |
| tree | ede34133cd24f2fb7231e06f3933507d1241c13d /phpBB/viewforum.php | |
| parent | a7984e660da4def80d28a4efeacb5ee861c4718c (diff) | |
| download | forums-12a9e001837da139a9ea07b8dd52019ee071d9bd.tar forums-12a9e001837da139a9ea07b8dd52019ee071d9bd.tar.gz forums-12a9e001837da139a9ea07b8dd52019ee071d9bd.tar.bz2 forums-12a9e001837da139a9ea07b8dd52019ee071d9bd.tar.xz forums-12a9e001837da139a9ea07b8dd52019ee071d9bd.zip | |
- Do not split topic list for topics being promoted to announcements after been moved to another forum (Bug #18635)
- Allow editing usernames within database_update on username cleanup (Bug #18415)
- Fixing wrong sync() calls if moving all posts by a member in ACP (Bug #18385)
- Check entered imagemagick path for trailing slash (Bug #18205)
- Use proper title on index for new/unread posts (Bug #13101) - patch provided by Pyramide
- Allow calls to $user->set_cookie() define no cookie time for setting session cookies (Bug #18025)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8310 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 0b2af13d76..197f77065f 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -493,8 +493,9 @@ if (sizeof($shadow_topic_list)) // We want to retain some values $row = array_merge($row, array( 'topic_moved_id' => $rowset[$orig_topic_id]['topic_moved_id'], - 'topic_status' => $rowset[$orig_topic_id]['topic_status']) - ); + 'topic_status' => $rowset[$orig_topic_id]['topic_status'], + 'topic_type' => $rowset[$orig_topic_id]['topic_type'], + )); $rowset[$orig_topic_id] = $row; } |