aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-07-11 02:53:06 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-11 02:53:06 +0200
commit062d8fda04918753e61eea4c3fbcbe138efc7ed1 (patch)
tree1f133083847e62282584f4d0ceaecd75f93ddb47
parent2d9aa45aefc4d4e4c76edd7763efc2cd97b0801f (diff)
parentb939ce5940688430adb5fb54dda00e971b4eec49 (diff)
downloadforums-062d8fda04918753e61eea4c3fbcbe138efc7ed1.tar
forums-062d8fda04918753e61eea4c3fbcbe138efc7ed1.tar.gz
forums-062d8fda04918753e61eea4c3fbcbe138efc7ed1.tar.bz2
forums-062d8fda04918753e61eea4c3fbcbe138efc7ed1.tar.xz
forums-062d8fda04918753e61eea4c3fbcbe138efc7ed1.zip
Merge branch 'ticket/adamreyher/9012' into develop-olympus
* ticket/adamreyher/9012: [ticket/9012] Adjust shadow topic title to the title at the time it was moved.
-rw-r--r--phpBB/viewforum.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index d18508ccbc..5f33b7565f 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -508,6 +508,7 @@ if (sizeof($shadow_topic_list))
'topic_moved_id' => $rowset[$orig_topic_id]['topic_moved_id'],
'topic_status' => $rowset[$orig_topic_id]['topic_status'],
'topic_type' => $rowset[$orig_topic_id]['topic_type'],
+ 'topic_title' => $rowset[$orig_topic_id]['topic_title'],
));
// Shadow topics are never reported