diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql
index c50d655f13..f74cedf4d5 100644
--- a/phpBB/db/postgres_schema.sql
+++ b/phpBB/db/postgres_schema.sql
@@ -401,6 +401,7 @@ CREATE TABLE phpbb_topics (
topic_status int2 DEFAULT '0' NOT NULL,
topic_type int2 DEFAULT '0' NOT NULL,
topic_notify int2 DEFAULT '0',
+ topic_moved_id int4,
topic_last_post_id int4 DEFAULT '0' NOT NULL,
CONSTRAINT phpbb_topics_pkey PRIMARY KEY (topic_id)
);
diff --git a/phpBB/modcp.php b/phpBB/modcp.php
index 07f7454d3e..f37a02c70c 100644
--- a/phpBB/modcp.php
+++ b/phpBB/modcp.php
@@ -293,6 +293,7 @@ switch($mode)
$sql_select = 'SELECT
topic_title,
topic_poster,
+ topic_status,
topic_time
FROM '.
TOPICS_TABLE." WHERE
@@ -304,6 +305,7 @@ switch($mode)
else
{
$row = $db->sql_fetchrowset($result);
+
$ttitle = $row[0]['topic_title'];
$tpost = $row[0]['topic_poster'];
$ttime = $row[0]['topic_time'];
@@ -831,10 +833,15 @@ switch($mode)
for($x = 0; $x < $total_topics; $x++)
{
+ $topic_title = "";
if($topics[$x]['topic_status'] == TOPIC_LOCKED)
{
$folder_image = "
";
}
+ else if($topics[$x]['topic_status'] == TOPIC_MOVED)
+ {
+ $topic_title = "" . $lang['Topic_Moved'] . ": ";
+ }
else
{
$folder_image = "
";
@@ -842,15 +849,13 @@ switch($mode)
$topic_id = $topics[$x]['topic_id'];
- $topic_title = "";
-
if($topics[$x]['topic_type'] == POST_STICKY)
{
- $topic_title = $lang['Sticky'] . " ";
+ $topic_title = "".$lang['Post_Sticky'] . ": ";
}
else if($topics[$x]['topic_type'] == POST_ANNOUNCE)
{
- $topic_title = $lang['Annoucement'] . " ";
+ $topic_title = "" . $lang['Post_Announcement'] . ": ";
}
$topic_title .= stripslashes($topics[$x]['topic_title']);