4 files changed, 22 insertions, 8 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index a4ed1b5c86..a4bbfb7d7f 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -169,11 +169,16 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10437">PHPBB3-10437</a>] -  Announcements on moderation queue are not hidden</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10446">PHPBB3-10446</a>] -  Unencoded 8bit characters in email headers</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10452">PHPBB3-10452</a>] -  XHTML error when printing a PM</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10461'>PHPBB3-10461</a>] -  MCP&#39;s recent actions list is empty</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10479'>PHPBB3-10479</a>] -  Remove PostgreSQL version numbers from driver&#39;s language string</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10485'>PHPBB3-10485</a>] -  XHTML error in Prosilver - index and viewforum</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10488'>PHPBB3-10488</a>] -  Database updater for 3.0.10-RC1 overwrites config variable email_max_chunk_size without checking for custom value</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10497'>PHPBB3-10497</a>] -  SQL error when guest visits forum with unread topic</li>
 </ul>
 <h4>Improvement</h4>
 <ul>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8616">PHPBB3-8616</a>] -  Add direct link to PM to notification message</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] -  Forums that can be listed but not red expose forum information</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] -  Forums that can be listed but not read expose forum information</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9297">PHPBB3-9297</a>] -  Add support for Extended Passive Mode (EPSV) in class ftp_fsock to better support IPv6 connections.</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9307">PHPBB3-9307</a>] -  Mass email $max_chunk_size</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9361">PHPBB3-9361</a>] -  Edit account settings - Improved clarification needed</li>
@@ -214,6 +219,8 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9689">PHPBB3-9689</a>] -  Scripts and utilities</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10003">PHPBB3-10003</a>] -  Resolve db_tools proliferation</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10313">PHPBB3-10313</a>] -  Include slow unit tests when running build script</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10483'>PHPBB3-10483</a>] -  Test suite does not run with MySQL strict mode</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10486'>PHPBB3-10486</a>] -  Create git shortlog and git diff --stat in build script</li>
 </ul>
 
 	<a name="v308"></a><h3>1.ii. Changes since 3.0.8</h3>
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 944e53052b..7ce83b871a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1943,11 +1943,11 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 		}
 		else
 		{
-			$sql = 'SELECT topic_id
-				FROM ' . TOPICS_TABLE . '
-				WHERE forum_id = ' . $forum_id . '
-					AND topic_last_post_time > ' . $mark_time_forum . '
-					AND topic_moved_id = 0 ' .
+			$sql = 'SELECT t.topic_id
+				FROM ' . TOPICS_TABLE . ' t
+				WHERE t.forum_id = ' . $forum_id . '
+					AND t.topic_last_post_time > ' . $mark_time_forum . '
+					AND t.topic_moved_id = 0 ' .
 					$sql_update_unapproved;
 			$result = $db->sql_query($sql);
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 29d9c86fa9..8289e56ee8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -987,6 +987,9 @@ function database_update_info()
 		'3.0.9-RC4'     => array(),
 		// No changes from 3.0.9 to 3.0.10-RC1
 		'3.0.9'			=> array(),
+		// No changes from 3.0.10-RC1 to 3.0.10-RC2
+		'3.0.10-RC1'	=> array(),
+
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
@@ -2006,6 +2009,10 @@ function change_database_data(&$no_updates, $version)
 
 			$no_updates = false;
 		break;
+
+		// No changes from 3.0.10-RC1 to 3.0.10-RC2
+		case '3.0.10-RC1':
+		break;
 	}
 }
 
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index c4b100187f..f69ca40613 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -232,7 +232,7 @@ $lang = array_merge($lang, array(
 	'INST_ERR'					=> 'Installation error',
 	'INST_ERR_DB_CONNECT'		=> 'Could not connect to the database, see error message below.',
 	'INST_ERR_DB_FORUM_PATH'	=> 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.',
-	'INST_ERR_DB_INVALID_PREFIX'=> 'The prefix you entered is invalid. It must start with an alphanumeric character and must only contain alphanumeric characters, numbers and underscores.',
+	'INST_ERR_DB_INVALID_PREFIX'=> 'The prefix you entered is invalid. It must start with a letter and must only contain letters, numbers and underscores.',
 	'INST_ERR_DB_NO_ERROR'		=> 'No error message given.',
 	'INST_ERR_DB_NO_MYSQLI'		=> 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” option instead.',
 	'INST_ERR_DB_NO_SQLITE'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
@@ -353,7 +353,7 @@ $lang = array_merge($lang, array(
 
 	'TABLES_MISSING'			=> 'Could not find these tables<br />» <strong>%s</strong>.',
 	'TABLE_PREFIX'				=> 'Prefix for tables in database',
-	'TABLE_PREFIX_EXPLAIN'		=> 'The prefix must start with an alphanumeric character and must only contain alphanumeric characters, numbers and underscores.',
+	'TABLE_PREFIX_EXPLAIN'		=> 'The prefix must start with a letter and must only contain letters, numbers and underscores.',
 	'TABLE_PREFIX_SAME'			=> 'The table prefix needs to be the one used by the software you are converting from.<br />» Specified table prefix was %s.',
 	'TESTS_PASSED'				=> 'Tests passed',
 	'TESTS_FAILED'				=> 'Tests failed',