Next phase of last post changes + a few minor bugs

Note: This template variable is available but will not be used by default git-svn-id: file:///svn/phpbb/trunk@6360 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Graham Eames <grahamje@users.sourceforge.net> 2006-09-08 18:00:38 +0000
committer: Graham Eames <grahamje@users.sourceforge.net> 2006-09-08 18:00:38 +0000
commit: 6568ab756c636490ce74c5beb63b53a353e49fbe (patch)
tree: b717bad16bc567c6df4a86ccb5d49ec71fc3ea08
parent: b150ed03248ab577fdf61db0f23156fc09d597b4 (diff)
download: forums-6568ab756c636490ce74c5beb63b53a353e49fbe.tar
forums-6568ab756c636490ce74c5beb63b53a353e49fbe.tar.gz
forums-6568ab756c636490ce74c5beb63b53a353e49fbe.tar.bz2
forums-6568ab756c636490ce74c5beb63b53a353e49fbe.tar.xz
forums-6568ab756c636490ce74c5beb63b53a353e49fbe.zip
16 files changed, 43 insertions, 11 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index f3c03a7a69..9a0f782db6 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -901,6 +901,7 @@ function get_schema_struct()
 			'forum_topics_real'		=> array('UINT', 0),
 			'forum_last_post_id'	=> array('UINT', 0),
 			'forum_last_poster_id'	=> array('UINT', 0),
+			'forum_last_post_subject' => array('XSTEXT', ''),
 			'forum_last_post_time'	=> array('TIMESTAMP', 0),
 			'forum_last_poster_name'=> array('VCHAR', ''),
 			'forum_last_poster_colour'=> array('VCHAR:6', ''),
@@ -1618,6 +1619,7 @@ function get_schema_struct()
 			'topic_last_poster_id'		=> array('UINT', 0),
 			'topic_last_poster_name'	=> array('VCHAR', ''),
 			'topic_last_poster_colour'	=> array('VCHAR:6', ''),
+			'topic_last_post_subject'	=> array('XSTEXT', ''),
 			'topic_last_post_time'		=> array('TIMESTAMP', 0),
 			'topic_last_view_time'		=> array('TIMESTAMP', 0),
 			'topic_moved_id'			=> array('UINT', 0),
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 414e72ca89..26133786b3 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1375,6 +1375,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				$forum_data[$forum_id]['topics'] = 0;
 				$forum_data[$forum_id]['topics_real'] = 0;
 				$forum_data[$forum_id]['last_post_id'] = 0;
+				$forum_data[$forum_id]['last_post_subject'] = '';
 				$forum_data[$forum_id]['last_post_time'] = 0;
 				$forum_data[$forum_id]['last_poster_id'] = 0;
 				$forum_data[$forum_id]['last_poster_name'] = '';
@@ -1428,7 +1429,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			// 4: Retrieve last_post infos
 			if (sizeof($post_ids))
 			{
-				$sql = 'SELECT p.post_id, p.poster_id, p.post_time, p.post_username, u.username, u.user_colour
+				$sql = 'SELECT p.post_id, p.poster_id, p.post_subject, p.post_time, p.post_username, u.username, u.user_colour
 					FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
 					WHERE ' . $db->sql_in_set('p.post_id', $post_ids) . '
 						AND p.poster_id = u.user_id';
@@ -1446,6 +1447,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					{
 						if (isset($post_info[$data['last_post_id']]))
 						{
+							$forum_data[$forum_id]['last_post_subject'] = $post_info[$data['last_post_id']]['post_subject'];
 							$forum_data[$forum_id]['last_post_time'] = $post_info[$data['last_post_id']]['post_time'];
 							$forum_data[$forum_id]['last_poster_id'] = $post_info[$data['last_post_id']]['poster_id'];
 							$forum_data[$forum_id]['last_poster_name'] = ($post_info[$data['last_post_id']]['poster_id'] != ANONYMOUS) ? $post_info[$data['last_post_id']]['username'] : $post_info[$data['last_post_id']]['post_username'];
@@ -1455,6 +1457,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 						{
 							// For some reason we did not find the post in the db
 							$forum_data[$forum_id]['last_post_id'] = 0;
+							$forum_data[$forum_id]['last_post_subject'] = '';
 							$forum_data[$forum_id]['last_post_time'] = 0;
 							$forum_data[$forum_id]['last_poster_id'] = 0;
 							$forum_data[$forum_id]['last_poster_name'] = '';
@@ -1466,7 +1469,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			}
 
 			// 5: Now do that thing
-			$fieldnames = array('posts', 'topics', 'topics_real', 'last_post_id', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
+			$fieldnames = array('posts', 'topics', 'topics_real', 'last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
 
 			foreach ($forum_data as $forum_id => $row)
 			{
@@ -1476,7 +1479,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				{
 					if ($row['forum_' . $fieldname] != $row[$fieldname])
 					{
-						if (preg_match('#(name|colour)$#', $fieldname))
+						if (preg_match('#(name|colour|subject)$#', $fieldname))
 						{
 							$sql_ary['forum_' . $fieldname] = (string) $row[$fieldname];
 						}
@@ -1500,7 +1503,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 		case 'topic':
 			$topic_data = $post_ids = $approved_unapproved_ids = $resync_forums = $delete_topics = $delete_posts = $moved_topics = array();
 
-			$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_approved, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
+			$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_approved, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
 				FROM ' . TOPICS_TABLE . " t
 				$where_sql";
 			$result = $db->sql_query($sql);
@@ -1641,7 +1644,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				unset($delete_topics);
 			}
 
-			$sql = 'SELECT p.post_id, p.topic_id, p.post_approved, p.poster_id, p.post_username, p.post_time, u.username, u.user_colour
+			$sql = 'SELECT p.post_id, p.topic_id, p.post_approved, p.poster_id, p.post_subject, p.post_username, p.post_time, u.username, u.user_colour
 				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
 				WHERE ' . $db->sql_in_set('p.post_id', $post_ids) . '
 					AND u.user_id = p.poster_id';
@@ -1667,6 +1670,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				if ($row['post_id'] == $topic_data[$topic_id]['last_post_id'])
 				{
 					$topic_data[$topic_id]['last_poster_id'] = $row['poster_id'];
+					$topic_data[$topic_id]['last_post_subject'] = $row['post_subject'];
 					$topic_data[$topic_id]['last_post_time'] = $row['post_time'];
 					$topic_data[$topic_id]['last_poster_name'] = ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username'];
 					$topic_data[$topic_id]['last_poster_colour'] = $row['user_colour'];
@@ -1685,7 +1689,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			unset($approved_unapproved_ids);
 
 			// These are fields that will be synchronised
-			$fieldnames = array('time', 'replies', 'replies_real', 'poster', 'first_post_id', 'first_poster_name', 'first_poster_colour', 'last_post_id', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
+			$fieldnames = array('time', 'replies', 'replies_real', 'poster', 'first_post_id', 'first_poster_name', 'first_poster_colour', 'last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
 
 			if ($sync_extra)
 			{
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 35c78189f4..f46298002c 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -180,6 +180,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			if ($row['forum_last_post_time'] > $forum_rows[$parent_id]['forum_last_post_time'])
 			{
 				$forum_rows[$parent_id]['forum_last_post_id'] = $row['forum_last_post_id'];
+				$forum_rows[$parent_id]['forum_last_post_subject'] = $row['forum_last_post_subject'];
 				$forum_rows[$parent_id]['forum_last_post_time'] = $row['forum_last_post_time'];
 				$forum_rows[$parent_id]['forum_last_poster_id'] = $row['forum_last_poster_id'];
 				$forum_rows[$parent_id]['forum_last_poster_name'] = $row['forum_last_poster_name'];
@@ -304,6 +305,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		// Create last post link information, if appropriate
 		if ($row['forum_last_post_id'])
 		{
+			$last_post_subject = $row['forum_last_post_subject'];
 			$last_post_time = $user->format_date($row['forum_last_post_time']);
 
 			$last_poster = ($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] : $user->lang['GUEST'];
@@ -314,7 +316,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		}
 		else
 		{
-			$last_post_time = $last_poster = $last_poster_colour = $last_poster_url = $last_post_url = '';
+			$last_post_subject = $last_post_time = $last_poster = $last_poster_colour = $last_poster_url = $last_post_url = '';
 		}
 
 		// Output moderator listing ... if applicable
@@ -342,6 +344,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			'FORUM_FOLDER_IMG'		=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : $user->img($folder_image, $folder_alt),
 			'FORUM_FOLDER_IMG_SRC'	=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : $user->img($folder_image, $folder_alt, false, '', 'src'),
 			'SUBFORUMS'				=> $subforums_list,
+			'LAST_POST_SUBJECT'		=> $last_post_subject,
 			'LAST_POST_TIME'		=> $last_post_time,
 			'LAST_POSTER'			=> $last_poster,
 			'LAST_POSTER_COLOUR'	=> $last_poster_colour,
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index a8c7078057..1bc07debe1 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -139,6 +139,7 @@ function update_post_information($type, $ids, $return_update_sql = false)
 		foreach ($empty_forums as $void => $forum_id)
 		{
 			$update_sql[$forum_id][] = 'forum_last_post_id = 0';
+			$update_sql[$forum_id][] = "forum_last_post_subject = ''";
 			$update_sql[$forum_id][] = 'forum_last_post_time = 0';
 			$update_sql[$forum_id][] = 'forum_last_poster_id = 0';
 			$update_sql[$forum_id][] = "forum_last_poster_name = ''";
@@ -148,7 +149,7 @@ function update_post_information($type, $ids, $return_update_sql = false)
 
 	if (sizeof($last_post_ids))
 	{
-		$sql = 'SELECT p.' . $type . '_id, p.post_id, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour
+		$sql = 'SELECT p.' . $type . '_id, p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour
 			FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
 			WHERE p.poster_id = u.user_id
 				AND ' . $db->sql_in_set('p.post_id', $last_post_ids);
@@ -157,6 +158,7 @@ function update_post_information($type, $ids, $return_update_sql = false)
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$update_sql[$row["{$type}_id"]][] = $type . '_last_post_id = ' . (int) $row['post_id'];
+			$update_sql[$row["{$type}_id"]][] = "{$type}_last_post_subject = '" . $db->sql_escape($row['post_subject']) . "'";
 			$update_sql[$row["{$type}_id"]][] = $type . '_last_post_time = ' . (int) $row['post_time'];
 			$update_sql[$row["{$type}_id"]][] = $type . '_last_poster_id = ' . (int) $row['poster_id'];
 			$update_sql[$row["{$type}_id"]][] = "{$type}_last_poster_colour = '" . $db->sql_escape($row['user_colour']) . "'";
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 7e3199fcde..5b21e5a35a 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -127,8 +127,10 @@ class ucp_main
 					$template->assign_block_vars('topicrow', array(
 						'FORUM_ID'			=> $forum_id,
 						'TOPIC_ID'			=> $topic_id,
+						'LAST_POST_SUBJECT'	=> $row['topic_last_post_subject'],
 						'LAST_POST_TIME'	=> $user->format_date($row['topic_last_post_time']),
 						'LAST_POST_AUTHOR'	=> ($row['topic_last_poster_id'] == ANONYMOUS) ? (($row['topic_last_poster_name'] != '') ? $row['topic_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : $row['topic_last_poster_name'],
+						'LAST_POST_AUTHOR_COLOUR'	=> ($row['topic_last_poster_colour']) ? '#' . $row['topic_last_poster_colour'] : '',
 						'TOPIC_TITLE'		=> censor_text($row['topic_title']),
 						'TOPIC_TYPE'		=> $topic_type,
 
@@ -307,6 +309,7 @@ class ucp_main
 						'FORUM_FOLDER_IMG_SRC'	=> $user->img($folder_image, $folder_alt, false, '', 'src'),
 						'FORUM_NAME'			=> $row['forum_name'],
 						'LAST_POST_IMG'			=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
+						'LAST_POST_SUBJECT'		=> $row['forum_last_post_subject'],
 						'LAST_POST_TIME'		=> $last_post_time,
 						'LAST_POST_AUTHOR'		=> $last_poster,
 						'LAST_POST_AUTHOR_COLOUR' => $last_poster_colour,
@@ -429,6 +432,7 @@ class ucp_main
 						'TOPIC_AUTHOR'				=> ($row['topic_first_poster_name']) ? $row['topic_first_poster_name'] : $user->lang['GUEST'],
 						'TOPIC_AUTHOR_COLOUR'		=> ($row['topic_first_poster_colour']) ? '#' . $row['topic_first_poster_colour'] : '',
 						'FIRST_POST_TIME'			=> $user->format_date($row['topic_time']),
+						'LAST_POST_SUBJECT'			=> $row['topic_last_post_subject'],
 						'LAST_POST_TIME'			=> $user->format_date($row['topic_last_post_time']),
 						'LAST_VIEW_TIME'			=> $user->format_date($row['topic_last_view_time']),
 						'LAST_POST_AUTHOR'			=> ($row['topic_last_poster_name'] != '') ? $row['topic_last_poster_name'] : $user->lang['GUEST'],
@@ -592,6 +596,7 @@ class ucp_main
 						'TOPIC_AUTHOR'				=> ($row['topic_first_poster_name']) ? $row['topic_first_poster_name'] : $user->lang['GUEST'],
 						'TOPIC_AUTHOR_COLOUR'		=> ($row['topic_first_poster_colour']) ? '#' . $row['topic_first_poster_colour'] : '',
 						'FIRST_POST_TIME'			=> $user->format_date($row['topic_time']),
+						'LAST_POST_SUBJECT'			=> $row['topic_last_post_subject'],
 						'LAST_POST_TIME'			=> $user->format_date($row['topic_last_post_time']),
 						'LAST_VIEW_TIME'			=> $user->format_date($row['topic_last_view_time']),
 						'LAST_POST_AUTHOR'			=> ($row['topic_last_poster_name'] != '') ? $row['topic_last_poster_name'] : $user->lang['GUEST'],
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 29272964f9..9f6d82c747 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -114,9 +114,11 @@ $database_update_info = array(
 		'add_columns'		=> array(
 			TOPICS_TABLE			=> array(
 				'topic_first_poster_colour'	=> array('VCHAR:6', ''),
+				'topic_last_post_subject'	=> array('XSTEXT', ''),
 				'topic_last_poster_colour'	=> array('VCHAR:6', ''),
 			),
 			FORUMS_TABLE			=> array(
+				'forum_last_post_subject'	=> array('XSTEXT', ''),
 				'forum_last_poster_colour'	=> array('VCHAR:6', ''),
 			),
 		),
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 75ff84fcbb..3f96fa098b 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -37,7 +37,7 @@ if (!empty($setmodules))
 		'module_type'		=> 'update',
 		'module_title'		=> 'UPDATE',
 		'module_filename'	=> substr(basename(__FILE__), 0, -strlen($phpEx)-1),
-		'module_order'		=> 20,
+		'module_order'		=> 30,
 		'module_subs'		=> '',
 		'module_stages'		=> array('INTRO', 'VERSION_CHECK', 'FILE_CHECK', 'UPDATE_FILES', 'UPDATE_DB'),
 		'module_reqs'		=> ''
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 4a4415f185..44661698f2 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -370,6 +370,7 @@ CREATE TABLE phpbb_forums (
 	forum_topics_real INTEGER DEFAULT 0 NOT NULL,
 	forum_last_post_id INTEGER DEFAULT 0 NOT NULL,
 	forum_last_poster_id INTEGER DEFAULT 0 NOT NULL,
+	forum_last_post_subject BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	forum_last_post_time INTEGER DEFAULT 0 NOT NULL,
 	forum_last_poster_name VARCHAR(255) DEFAULT '' NOT NULL,
 	forum_last_poster_colour VARCHAR(6) DEFAULT '' NOT NULL,
@@ -1291,6 +1292,7 @@ CREATE TABLE phpbb_topics (
 	topic_last_poster_id INTEGER DEFAULT 0 NOT NULL,
 	topic_last_poster_name VARCHAR(255) DEFAULT '' NOT NULL,
 	topic_last_poster_colour VARCHAR(6) DEFAULT '' NOT NULL,
+	topic_last_post_subject BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	topic_last_post_time INTEGER DEFAULT 0 NOT NULL,
 	topic_last_view_time INTEGER DEFAULT 0 NOT NULL,
 	topic_moved_id INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index acd33bda23..14fd6ec084 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -422,6 +422,7 @@ CREATE TABLE [phpbb_forums] (
 	[forum_topics_real] [int] DEFAULT (0) NOT NULL ,
 	[forum_last_post_id] [int] DEFAULT (0) NOT NULL ,
 	[forum_last_poster_id] [int] DEFAULT (0) NOT NULL ,
+	[forum_last_post_subject] [varchar] (1000) DEFAULT ('') NOT NULL ,
 	[forum_last_post_time] [int] DEFAULT (0) NOT NULL ,
 	[forum_last_poster_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[forum_last_poster_colour] [varchar] (6) DEFAULT ('') NOT NULL ,
@@ -1475,6 +1476,7 @@ CREATE TABLE [phpbb_topics] (
 	[topic_last_poster_id] [int] DEFAULT (0) NOT NULL ,
 	[topic_last_poster_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[topic_last_poster_colour] [varchar] (6) DEFAULT ('') NOT NULL ,
+	[topic_last_post_subject] [varchar] (1000) DEFAULT ('') NOT NULL ,
 	[topic_last_post_time] [int] DEFAULT (0) NOT NULL ,
 	[topic_last_view_time] [int] DEFAULT (0) NOT NULL ,
 	[topic_moved_id] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 6b418fe2ef..7c266c2010 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -242,6 +242,7 @@ CREATE TABLE phpbb_forums (
 	forum_topics_real mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	forum_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	forum_last_poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	forum_last_post_subject text DEFAULT '' NOT NULL,
 	forum_last_post_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	forum_last_poster_name varchar(255) DEFAULT '' NOT NULL,
 	forum_last_poster_colour varchar(6) DEFAULT '' NOT NULL,
@@ -892,6 +893,7 @@ CREATE TABLE phpbb_topics (
 	topic_last_poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	topic_last_poster_name varchar(255) DEFAULT '' NOT NULL,
 	topic_last_poster_colour varchar(6) DEFAULT '' NOT NULL,
+	topic_last_post_subject text DEFAULT '' NOT NULL,
 	topic_last_post_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	topic_last_view_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index adc683ec07..fc357802f1 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -497,6 +497,7 @@ CREATE TABLE phpbb_forums (
 	forum_topics_real number(8) DEFAULT '0' NOT NULL,
 	forum_last_post_id number(8) DEFAULT '0' NOT NULL,
 	forum_last_poster_id number(8) DEFAULT '0' NOT NULL,
+	forum_last_post_subject varchar2(1000) DEFAULT '' ,
 	forum_last_post_time number(11) DEFAULT '0' NOT NULL,
 	forum_last_poster_name varchar2(255) DEFAULT '' ,
 	forum_last_poster_colour varchar2(6) DEFAULT '' ,
@@ -1659,6 +1660,7 @@ CREATE TABLE phpbb_topics (
 	topic_last_poster_id number(8) DEFAULT '0' NOT NULL,
 	topic_last_poster_name varchar2(255) DEFAULT '' ,
 	topic_last_poster_colour varchar2(6) DEFAULT '' ,
+	topic_last_post_subject varchar2(1000) DEFAULT '' ,
 	topic_last_post_time number(11) DEFAULT '0' NOT NULL,
 	topic_last_view_time number(11) DEFAULT '0' NOT NULL,
 	topic_moved_id number(8) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index d6db57ad10..22b60b361b 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -374,6 +374,7 @@ CREATE TABLE phpbb_forums (
 	forum_topics_real INT4 DEFAULT '0' NOT NULL CHECK (forum_topics_real >= 0),
 	forum_last_post_id INT4 DEFAULT '0' NOT NULL CHECK (forum_last_post_id >= 0),
 	forum_last_poster_id INT4 DEFAULT '0' NOT NULL CHECK (forum_last_poster_id >= 0),
+	forum_last_post_subject varchar(1000) DEFAULT '' NOT NULL,
 	forum_last_post_time INT4 DEFAULT '0' NOT NULL CHECK (forum_last_post_time >= 0),
 	forum_last_poster_name varchar(255) DEFAULT '' NOT NULL,
 	forum_last_poster_colour varchar(6) DEFAULT '' NOT NULL,
@@ -1140,6 +1141,7 @@ CREATE TABLE phpbb_topics (
 	topic_last_poster_id INT4 DEFAULT '0' NOT NULL CHECK (topic_last_poster_id >= 0),
 	topic_last_poster_name varchar(255) DEFAULT '' NOT NULL,
 	topic_last_poster_colour varchar(6) DEFAULT '' NOT NULL,
+	topic_last_post_subject varchar(1000) DEFAULT '' NOT NULL,
 	topic_last_post_time INT4 DEFAULT '0' NOT NULL CHECK (topic_last_post_time >= 0),
 	topic_last_view_time INT4 DEFAULT '0' NOT NULL CHECK (topic_last_view_time >= 0),
 	topic_moved_id INT4 DEFAULT '0' NOT NULL CHECK (topic_moved_id >= 0),
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 71834e2e06..63cd94e5fb 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -394,7 +394,7 @@ INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path, theme_d
 # -- Forums
 INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed) VALUES ('My first Category', '', 1, 4, 0, 0, 1, 1, 1, 1, 2, 'Admin', 'AA0000', 972086460, '', '', '', '', '', '', '', 0, 0);
 
-INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed) VALUES ('Test Forum 1', 'This is just a test forum.', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 'AA0000', 972086460, '', '', '', '', '', '', '', 0, 0);
+INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_subject, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed) VALUES ('Test Forum 1', 'This is just a test forum.', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 'AA0000', 'Welcome to phpBB 3', 972086460, '', '', '', '', '', '', '', 0, 0);
 
 # -- Users / Anonymous user
 INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (2, 1, 'Anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
@@ -545,7 +545,7 @@ INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id,
 
 
 # -- Demo Topic
-INSERT INTO phpbb_topics (topic_title, topic_poster, topic_time, topic_views, topic_replies, topic_replies_real, forum_id, topic_status, topic_type, topic_first_post_id, topic_first_poster_name, topic_first_poster_colour, topic_last_post_id, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour, topic_last_post_time, topic_last_view_time, poll_title) VALUES ('Welcome to phpBB 3', 2, 972086460, 0, 0, 0, 2, 0, 0, 1, 'Admin', 'AA0000', 1, 2, 'Admin', 'AA0000', 972086460, 972086460, '');
+INSERT INTO phpbb_topics (topic_title, topic_poster, topic_time, topic_views, topic_replies, topic_replies_real, forum_id, topic_status, topic_type, topic_first_post_id, topic_first_poster_name, topic_first_poster_colour, topic_last_post_id, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour, topic_last_post_subject, topic_last_post_time, topic_last_view_time, poll_title) VALUES ('Welcome to phpBB 3', 2, 972086460, 0, 0, 0, 2, 0, 0, 1, 'Admin', 'AA0000', 1, 2, 'Admin', 'AA0000', 'Welcome to phpBB 3', 972086460, 972086460, '');
 
 # -- Demo Post
 INSERT INTO phpbb_posts (topic_id, forum_id, poster_id, icon_id, post_time, post_username, poster_ip, post_subject, post_text, post_checksum, bbcode_uid) VALUES (1, 2, 2, 1, 972086460, '', '127.0.0.1', 'Welcome to phpBB 3', 'This is an example post in your phpBB 3.0 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!', '5dd683b17f641daf84c040bfefc58ce9', '');
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index a06d6b1f24..5ffbc0efec 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -235,6 +235,7 @@ CREATE TABLE phpbb_forums (
 	forum_topics_real INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	forum_last_post_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	forum_last_poster_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_last_post_subject text(65535) NOT NULL DEFAULT '',
 	forum_last_post_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	forum_last_poster_name varchar(255) NOT NULL DEFAULT '',
 	forum_last_poster_colour varchar(6) NOT NULL DEFAULT '',
@@ -864,6 +865,7 @@ CREATE TABLE phpbb_topics (
 	topic_last_poster_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	topic_last_poster_name varchar(255) NOT NULL DEFAULT '',
 	topic_last_poster_colour varchar(6) NOT NULL DEFAULT '',
+	topic_last_post_subject text(65535) NOT NULL DEFAULT '',
 	topic_last_post_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	topic_last_view_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	topic_moved_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
diff --git a/phpBB/search.php b/phpBB/search.php
index b728adc14e..1787989048 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -719,6 +719,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 					'TOPIC_AUTHOR'				=> ($row['topic_first_poster_name']) ? $row['topic_first_poster_name'] : $user->lang['GUEST'],
 					'TOPIC_AUTHOR_COLOUR'		=> ($row['topic_first_poster_colour']) ? '#' . $row['topic_first_poster_colour'] : '',
 					'FIRST_POST_TIME'			=> $user->format_date($row['topic_time']),
+					'LAST_POST_SUBJECT'			=> $row['topic_last_post_subject'],
 					'LAST_POST_TIME'			=> $user->format_date($row['topic_last_post_time']),
 					'LAST_VIEW_TIME'			=> $user->format_date($row['topic_last_view_time']),
 					'LAST_POST_AUTHOR'			=> ($row['topic_last_poster_name'] != '') ? $row['topic_last_poster_name'] : $user->lang['GUEST'],
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index d103b7e1fb..a1c59f154e 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -517,6 +517,7 @@ if (sizeof($topic_list))
 			'TOPIC_AUTHOR'				=> ($row['topic_first_poster_name']) ? $row['topic_first_poster_name'] : $user->lang['GUEST'],
 			'TOPIC_AUTHOR_COLOUR'		=> ($row['topic_first_poster_colour']) ? '#' . $row['topic_first_poster_colour'] : '',
 			'FIRST_POST_TIME'			=> $user->format_date($row['topic_time']),
+			'LAST_POST_SUBJECT'			=> $row['topic_last_post_subject'],
 			'LAST_POST_TIME'			=> $user->format_date($row['topic_last_post_time']),
 			'LAST_VIEW_TIME'			=> $user->format_date($row['topic_last_view_time']),
 			'LAST_POST_AUTHOR'			=> ($row['topic_last_poster_name']) ? $row['topic_last_poster_name'] : $user->lang['GUEST'],
author	Graham Eames <grahamje@users.sourceforge.net>	2006-09-08 18:00:38 +0000
committer	Graham Eames <grahamje@users.sourceforge.net>	2006-09-08 18:00:38 +0000
commit	6568ab756c636490ce74c5beb63b53a353e49fbe (patch)
tree	b717bad16bc567c6df4a86ccb5d49ec71fc3ea08
parent	b150ed03248ab577fdf61db0f23156fc09d597b4 (diff)
download	forums-6568ab756c636490ce74c5beb63b53a353e49fbe.tar forums-6568ab756c636490ce74c5beb63b53a353e49fbe.tar.gz forums-6568ab756c636490ce74c5beb63b53a353e49fbe.tar.bz2 forums-6568ab756c636490ce74c5beb63b53a353e49fbe.tar.xz forums-6568ab756c636490ce74c5beb63b53a353e49fbe.zip