[prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog

author: Nils Adermann <naderman@naderman.de> 2010-11-19 11:36:14 +0100
committer: Nils Adermann <naderman@naderman.de> 2010-11-19 13:22:36 +0100
commit: af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f (patch)
tree: 3963b4075f58c43ffc01fe290b04a800668bc53c
parent: 2831a3a9a97c1ee8b714c8034c64379eff90faa0 (diff)
download: forums-af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f.tar
forums-af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f.tar.gz
forums-af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f.tar.bz2
forums-af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f.tar.xz
forums-af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f.zip
5 files changed, 28 insertions, 10 deletions
diff --git a/build/build.xml b/build/build.xml
index 69caa897c3..bf77d82f6c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.0.8-RC1" />
-	<property name="prevversion" value="3.0.7-PL1" />
-	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6" />
+	<property name="newversion" value="3.0.8" />
+	<property name="prevversion" value="3.0.8-RC1" />
+	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7-PL1" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index f5d6da94b9..66915b18fa 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -90,6 +90,12 @@
 		<div class="content">
 
 	<a name="v307-PL1"></a><h3>1.i. Changes since 3.0.7-PL1</h3>
+<h4>        Security
+</h4>
+<ul>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9903'>PHPBB3-9903</a>] -         Execute javascript in [flash=] BBCode
+</li>
+</ul>
 
 <h4>        Bug
 </h4>
@@ -404,6 +410,8 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9891'>PHPBB3-9891</a>] -         Updater drops language-selection after database-update
 </li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9509'>PHPBB3-9509</a>] -         phpBB Coding Guidelines state subversion as the version control system for phpBB
+</li>
 </ul>
 
 <h4>        Improvement
@@ -467,6 +475,8 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9880'>PHPBB3-9880</a>] -         Rename all mentions of CAPTCHA or visual confirmation to anti-bot
 </li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9899'>PHPBB3-9899</a>] -         Change the style in the ACP for the recaptcha to match that displayed on prosilver
+</li>
 </ul>
 
 <h4>        New Feature
@@ -509,6 +519,8 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9868'>PHPBB3-9868</a>] -         Make the test suite run and pass using the mssqlnative driver
 </li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9904'>PHPBB3-9904</a>] -         Update WebPI Parameters.xml
+</li>
 </ul>
 
 <h4>        Sub-task
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index a4635895b0..af2a6ebd24 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.0.8-RC1');
+define('PHPBB_VERSION', '3.0.8');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 01e8ef7658..0ec9f24190 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.8-RC1';
+$updates_to_version = '3.0.8';
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
@@ -914,6 +914,8 @@ function database_update_info()
 		'3.0.7'		=> array(),
 		// No changes from 3.0.7-PL1 to 3.0.8-RC1
 		'3.0.7-PL1'		=> array(),
+		// No changes from 3.0.8-RC1 to 3.0.8
+		'3.0.8-RC1'		=> array(),
 	);
 }
 
@@ -1672,7 +1674,7 @@ function change_database_data(&$no_updates, $version)
 					"{$phpbb_root_path}language/$lang_dir/install.$phpEx",
 					"{$phpbb_root_path}language/$lang_dir/acp/attachments.$phpEx",
 				);
-				
+
 				foreach ($lang_files as $lang_file)
 				{
 					if (!file_exists($lang_file))
@@ -1852,6 +1854,10 @@ function change_database_data(&$no_updates, $version)
 
 			$no_updates = false;
 		break;
+
+		// No changes from 3.0.8-RC1 to 3.0.8
+		case '3.0.8-RC1':
+		break;
 	}
 }
 
@@ -1998,7 +2004,7 @@ class updater_db_tools
 			'VCHAR_CI'	=> '[varchar] (255)',
 			'VARBINARY'	=> '[varchar] (255)',
 		),
-		
+
 		'mssqlnative'	=> array(
 			'INT:'		=> '[int]',
 			'BINT'		=> '[float]',
@@ -2028,7 +2034,7 @@ class updater_db_tools
 			'VCHAR_CI'	=> '[varchar] (255)',
 			'VARBINARY'	=> '[varchar] (255)',
 		),
-		
+
 		'oracle'	=> array(
 			'INT:'		=> 'number(%d)',
 			'BINT'		=> 'number(20)',
@@ -2175,7 +2181,7 @@ class updater_db_tools
 			case 'mssql_odbc':
 				$this->sql_layer = 'mssql';
 			break;
-			
+
 			case 'mssqlnative':
 				$this->sql_layer = 'mssqlnative';
 			break;
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index cbee2c9ba1..e3c9d1e13a 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -242,7 +242,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.8-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.8');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
author	Nils Adermann <naderman@naderman.de>	2010-11-19 11:36:14 +0100
committer	Nils Adermann <naderman@naderman.de>	2010-11-19 13:22:36 +0100
commit	af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f (patch)
tree	3963b4075f58c43ffc01fe290b04a800668bc53c
parent	2831a3a9a97c1ee8b714c8034c64379eff90faa0 (diff)
download	forums-af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f.tar forums-af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f.tar.gz forums-af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f.tar.bz2 forums-af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f.tar.xz forums-af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f.zip