Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373

# By Joseph Warner (188) and others
# Via Andreas Fischer (41) and others
* 'develop' of github.com:phpbb/phpbb3: (435 commits)
  [ticket/11745] Correct language, coding guidelines
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [ticket/develop/11832] Fix path detection
  [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
  [ticket/11833] Fix bad template loop
  [feature/oauth] Fix tabindex
  [ticket/11816] !$DOESNT_EXIST test
  [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
  [ticket/11829] Use report_closed to determine status in MCP report_details
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [feature/oauth] Fix bug on ucp_auth_link related to error display
  ...

phpBB/phpbb/db/migration/data/30x/3_0_1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.1', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_10.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_10 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.10', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.10', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_10_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.10-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.10-RC1', '>=');
 	}
 
 	static public function depends_on()
@@ -24,7 +24,7 @@ class phpbb_db_migration_data_30x_3_0_10_rc1 extends phpbb_db_migration
 		return array(
 			array('config.add', array('email_max_chunk_size', 50)),
 
-			array('config.update', array('version', '3.0.10-rc1')),
+			array('config.update', array('version', '3.0.10-RC1')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_10_rc2 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.10-rc2', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.10-RC2', '>=');
 	}
 
 	static public function depends_on()
@@ -22,7 +22,7 @@ class phpbb_db_migration_data_30x_3_0_10_rc2 extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('version', '3.0.10-rc2')),
+			array('config.update', array('version', '3.0.10-RC2')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_10_rc3 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.10-rc3', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.10-RC3', '>=');
 	}
 
 	static public function depends_on()
@@ -22,7 +22,7 @@ class phpbb_db_migration_data_30x_3_0_10_rc3 extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('version', '3.0.10-rc3')),
+			array('config.update', array('version', '3.0.10-RC3')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_11.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_11 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.11', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.11', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_11_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.11-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.11-RC1', '>=');
 	}
 
 	static public function depends_on()
@@ -25,7 +25,7 @@ class phpbb_db_migration_data_30x_3_0_11_rc1 extends phpbb_db_migration
 			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
 			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
 
-			array('config.update', array('version', '3.0.11-rc1')),
+			array('config.update', array('version', '3.0.11-RC1')),
 		);
 	}
 

phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_11_rc2 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.11-rc2', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.11-RC2', '>=');
 	}
 
 	static public function depends_on()
@@ -44,7 +44,7 @@ class phpbb_db_migration_data_30x_3_0_11_rc2 extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('version', '3.0.11-rc2')),
+			array('config.update', array('version', '3.0.11-RC2')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php

@@ -13,7 +13,7 @@ class phpbb_db_migration_data_30x_3_0_12_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.12-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.12-RC1', '>=');
 	}
 
  	static public function depends_on()
@@ -28,7 +28,7 @@ class phpbb_db_migration_data_30x_3_0_12_rc1 extends phpbb_db_migration
 			array('custom', array(array(&$this, 'update_bots'))),
 			array('custom', array(array(&$this, 'disable_bots_from_receiving_pms'))),
 
-			array('config.update', array('version', '3.0.12-rc1')),
+			array('config.update', array('version', '3.0.12-RC1')),
 		);
 	}
 
@@ -108,7 +108,7 @@ class phpbb_db_migration_data_30x_3_0_12_rc1 extends phpbb_db_migration
 						WHERE user_id = $bot_user_id";
 					$this->sql_query($sql);
 
-					user_delete('remove', $bot_user_id);
+					user_delete('retain', $bot_user_id);
 				}
 				else
 				{

phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_1_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.1-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.1-RC1', '>=');
 	}
 
 	public function update_schema()
@@ -74,7 +74,7 @@ class phpbb_db_migration_data_30x_3_0_1_rc1 extends phpbb_db_migration
 			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
 			array('custom', array(array(&$this, 'reset_smiley_size'))),
 
-			array('config.update', array('version', '3.0.1-rc1')),
+			array('config.update', array('version', '3.0.1-RC1')),
 		);
 	}
 

phpBB/phpbb/db/migration/data/30x/3_0_2.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_2 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.2', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.2', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_2_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.2-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.2-RC1', '>=');
 	}
 
 	static public function depends_on()
@@ -26,7 +26,7 @@ class phpbb_db_migration_data_30x_3_0_2_rc1 extends phpbb_db_migration
 			array('config.add', array('check_attachment_content', '1')),
 			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
 
-			array('config.update', array('version', '3.0.2-rc1')),
+			array('config.update', array('version', '3.0.2-RC1')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_2_rc2 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.2-rc2', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.2-RC2', '>=');
 	}
 
 	static public function depends_on()
@@ -74,7 +74,7 @@ class phpbb_db_migration_data_30x_3_0_2_rc2 extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('version', '3.0.2-rc2')),
+			array('config.update', array('version', '3.0.2-RC2')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_3.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_3 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.3', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.3', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_3_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.3-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.3-RC1', '>=');
 	}
 
 	static public function depends_on()
@@ -60,7 +60,7 @@ class phpbb_db_migration_data_30x_3_0_3_rc1 extends phpbb_db_migration
 			array('permission.add', array('u_masspm_group', true, 'u_masspm')),
 			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
 
-			array('config.update', array('version', '3.0.3-rc1')),
+			array('config.update', array('version', '3.0.3-RC1')),
 		);
 	}
 

phpBB/phpbb/db/migration/data/30x/3_0_4.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_4 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.4', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.4', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_4_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.4-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.4-RC1', '>=');
 	}
 
 	static public function depends_on()
@@ -76,7 +76,7 @@ class phpbb_db_migration_data_30x_3_0_4_rc1 extends phpbb_db_migration
 		return array(
 			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
 
-			array('config.update', array('version', '3.0.4-rc1')),
+			array('config.update', array('version', '3.0.4-RC1')),
 		);
 	}
 

phpBB/phpbb/db/migration/data/30x/3_0_5.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_5 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.5', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.5', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_5_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.5-RC1', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_5_rc1part2 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.5-RC1', '>=');
 	}
 
 	static public function depends_on()
@@ -36,7 +36,7 @@ class phpbb_db_migration_data_30x_3_0_5_rc1part2 extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('version', '3.0.5-rc1')),
+			array('config.update', array('version', '3.0.5-RC1')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_6.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_6 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.6', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.6', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.6-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.6-RC1', '>=');
 	}
 
 	static public function depends_on()
@@ -185,7 +185,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration
 			array('custom', array(array(&$this, 'add_newly_registered_group'))),
 			array('custom', array(array(&$this, 'set_user_options_default'))),
 
-			array('config.update', array('version', '3.0.6-rc1')),
+			array('config.update', array('version', '3.0.6-RC1')),
 		);
 	}
 

phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc2 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.6-rc2', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.6-RC2', '>=');
 	}
 
 	static public function depends_on()
@@ -22,7 +22,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc2 extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('version', '3.0.6-rc2')),
+			array('config.update', array('version', '3.0.6-RC2')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc3 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.6-rc3', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.6-RC3', '>=');
 	}
 
 	static public function depends_on()
@@ -24,7 +24,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc3 extends phpbb_db_migration
 		return array(
 			array('custom', array(array(&$this, 'update_cp_fields'))),
 
-			array('config.update', array('version', '3.0.6-rc3')),
+			array('config.update', array('version', '3.0.6-RC3')),
 		);
 	}
 

phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc4 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.6-rc4', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.6-RC4', '>=');
 	}
 
 	static public function depends_on()
@@ -22,7 +22,7 @@ class phpbb_db_migration_data_30x_3_0_6_rc4 extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('version', '3.0.6-rc4')),
+			array('config.update', array('version', '3.0.6-RC4')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_7.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_7 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.7', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.7', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_7_pl1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.7-pl1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.7-pl1', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_7_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.7-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.7-RC1', '>=');
 	}
 
 	static public function depends_on()
@@ -62,7 +62,7 @@ class phpbb_db_migration_data_30x_3_0_7_rc1 extends phpbb_db_migration
 			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
 			array('custom', array(array(&$this, 'delete_text_templates'))),
 
-			array('config.update', array('version', '3.0.7-rc1')),
+			array('config.update', array('version', '3.0.7-RC1')),
 		);
 	}
 

phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_7_rc2 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.7-rc2', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.7-RC2', '>=');
 	}
 
 	static public function depends_on()
@@ -24,7 +24,7 @@ class phpbb_db_migration_data_30x_3_0_7_rc2 extends phpbb_db_migration
 		return array(
 			array('custom', array(array(&$this, 'update_email_hash'))),
 
-			array('config.update', array('version', '3.0.7-rc2')),
+			array('config.update', array('version', '3.0.7-RC2')),
 		);
 	}
 

phpBB/phpbb/db/migration/data/30x/3_0_8.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_8 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.8', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.8', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_8_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.8-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.8-RC1', '>=');
 	}
 
 	static public function depends_on()
@@ -38,7 +38,7 @@ class phpbb_db_migration_data_30x_3_0_8_rc1 extends phpbb_db_migration
 			array('config.update_if_equals', array(600, 'queue_interval', 60)),
 			array('config.update_if_equals', array(50, 'email_package_size', 20)),
 
-			array('config.update', array('version', '3.0.8-rc1')),
+			array('config.update', array('version', '3.0.8-RC1')),
 		);
 	}
 

phpBB/phpbb/db/migration/data/30x/3_0_9.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_9 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.9', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.9', '>=');
 	}
 
 	static public function depends_on()

phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc1 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.9-rc1', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.9-RC1', '>=');
 	}
 
 	static public function depends_on()
@@ -74,7 +74,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc1 extends phpbb_db_migration
 			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
 			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
 
-			array('config.update', array('version', '3.0.9-rc1')),
+			array('config.update', array('version', '3.0.9-RC1')),
 		);
 	}
 

phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc2 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.9-rc2', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.9-RC2', '>=');
 	}
 
 	static public function depends_on()
@@ -22,7 +22,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc2 extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('version', '3.0.9-rc2')),
+			array('config.update', array('version', '3.0.9-RC2')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc3 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.9-rc3', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.9-RC3', '>=');
 	}
 
 	static public function depends_on()
@@ -22,7 +22,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc3 extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('version', '3.0.9-rc3')),
+			array('config.update', array('version', '3.0.9-RC3')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php

@@ -11,7 +11,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc4 extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.0.9-rc4', '>=');
+		return phpbb_version_compare($this->config['version'], '3.0.9-RC4', '>=');
 	}
 
 	static public function depends_on()
@@ -22,7 +22,7 @@ class phpbb_db_migration_data_30x_3_0_9_rc4 extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('version', '3.0.9-rc4')),
+			array('config.update', array('version', '3.0.9-RC4')),
 		);
 	}
 }

phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php

@@ -0,0 +1,71 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'auth_provider_oauth');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'	=> array(
+				$this->table_prefix . 'oauth_tokens'	=> array(
+					'COLUMNS' => array(
+						'user_id'			=> array('UINT', 0), // phpbb_users.user_id
+						'session_id'		=> array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set
+						'provider'			=> array('VCHAR', ''), // Name of the OAuth provider
+						'oauth_token'		=> array('MTEXT', ''), // Serialized token
+					),
+					'KEYS' => array(
+						'user_id'			=> array('INDEX', 'user_id'),
+						'provider'			=> array('INDEX', 'provider'),
+					),
+				),
+				$this->table_prefix . 'oauth_accounts'	=> array(
+					'COLUMNS' => array(
+						'user_id'			=> array('UINT', 0),
+						'provider'			=> array('VCHAR', ''),
+						'oauth_provider_id'	=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY' => array(
+						'user_id',
+						'provider',
+					),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'	=> array(
+				$this->table_prefix . 'oauth_tokens',
+				$this->table_prefix . 'oauth_accounts',
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('module.add', array(
+				'ucp',
+				'UCP_PROFILE',
+				array(
+					'module_basename'	=> 'ucp_auth_link',
+					'modes'				=> array('auth_link'),
+				),
+			)),
+		);
+	}
+}

phpBB/phpbb/db/migration/data/310/signature_module_auth.php

@@ -17,7 +17,7 @@ class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migrati
 				AND module_basename = 'ucp_profile'
 				AND module_mode = 'signature'";
 		$result = $this->db->sql_query($sql);
-		$module_auth = $this->db_sql_fetchfield('module_auth');
+		$module_auth = $this->db->sql_fetchfield('module_auth');
 		$this->db->sql_freeresult($result);
 
 		return $module_auth === 'acl_u_sig' || $module_auth === false;

phpBB/phpbb/db/migration/data/310/softdelete_mcp_modules.php

@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_softdelete_mcp_modules extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		$sql = 'SELECT module_id
+			FROM ' . MODULES_TABLE . "
+			WHERE module_class = 'mcp'
+				AND module_basename = 'mcp_queue'
+				AND module_mode = 'deleted_topics'";
+		$result = $this->db->sql_query($sql);
+		$module_id = $this->db->sql_fetchfield('module_id');
+		$this->db->sql_freeresult($result);
+
+		return $module_id !== false;
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'phpbb_db_migration_data_310_dev',
+			'phpbb_db_migration_data_310_softdelete_p2',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('module.add', array(
+				'mcp',
+				'MCP_QUEUE',
+				array(
+					'module_basename'	=> 'mcp_queue',
+					'modes'				=> array('deleted_topics'),
+				),
+			)),
+			array('module.add', array(
+				'mcp',
+				'MCP_QUEUE',
+				array(
+					'module_basename'	=> 'mcp_queue',
+					'modes'				=> array('deleted_posts'),
+				),
+			)),
+		);
+	}
+}