From 87832d06cca520e27c5dbed1c36ab9c12240ae3d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 1 May 2011 04:03:06 -0400
Subject: [feature/template-engine] Delete template class, use phpbb_template
 instead.

PHPBB3-9726
---
 phpBB/install/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 3cbc8744dd..6618e42ae8 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -262,7 +262,7 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle
 
 $user = new user();
 $auth = new auth();
-$template = new template();
+$template = new phpbb_template();
 
 // Add own hook handler, if present. :o
 if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
-- 
cgit v1.2.1


From 5a4a1e3c25b0e10a3ce008dc2eded29decb0f469 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 11 May 2011 03:51:34 +0200
Subject: [ticket/10126] Use binary "and not" instead of binary "xor" in
 error_reporting.

Make what we want to achieve clear by using "and not" instead of "xor".

PHPBB3-10126
---
 phpBB/install/database_update.php | 2 +-
 phpBB/install/index.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 01048520d2..3d32a82cc6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -35,7 +35,7 @@ if (!defined('E_DEPRECATED'))
 {
 	define('E_DEPRECATED', 8192);
 }
-//error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+//error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 error_reporting(E_ALL);
 
 @set_time_limit(0);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 49c99da0d7..bace22f177 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -23,7 +23,7 @@ if (!defined('E_DEPRECATED'))
 {
 	define('E_DEPRECATED', 8192);
 }
-error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 
 // @todo Review this test and see if we can find out what it is which prevents PHP 4.2.x from even displaying the page with requirements on it
 if (version_compare(PHP_VERSION, '4.3.3') < 0)
-- 
cgit v1.2.1


From 94c28efe079c0c06cdc6ebacb49cfa4dd98d09c0 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Tue, 1 Mar 2011 21:19:38 -0500
Subject: [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.

PHPBB3-10039
---
 phpBB/install/convertors/functions_phpbb20.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 78224dd5da..466f57a572 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -94,6 +94,7 @@ function phpbb_insert_forums()
 	{
 		case 'mssql':
 		case 'mssql_odbc':
+		case 'mssqlnative':
 			$db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' ON');
 		break;
 	}
@@ -291,6 +292,7 @@ function phpbb_insert_forums()
 
 		case 'mssql':
 		case 'mssql_odbc':
+		case 'mssqlnative':
 			$db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' OFF');
 		break;
 
@@ -1727,6 +1729,7 @@ function phpbb_create_userconv_table()
 
 		case 'mssql':
 		case 'mssql_odbc':
+		case 'mssqlnative':
 			$map_dbms = 'mssql';
 		break;
 
-- 
cgit v1.2.1


From 8fa44cc3b9778f84ca20eab1c1d404c4f848eab4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 19 Oct 2010 17:06:23 +0200
Subject: [ticket/8542] Display custom profile fields in private messages

Introduce an option to display the cpf in the PM view.

PHPBB3-8542
---
 phpBB/install/database_update.php         | 6 ++++++
 phpBB/install/schemas/firebird_schema.sql | 1 +
 phpBB/install/schemas/mssql_schema.sql    | 1 +
 phpBB/install/schemas/mysql_40_schema.sql | 1 +
 phpBB/install/schemas/mysql_41_schema.sql | 1 +
 phpBB/install/schemas/oracle_schema.sql   | 1 +
 phpBB/install/schemas/postgres_schema.sql | 1 +
 phpBB/install/schemas/schema_data.sql     | 1 +
 phpBB/install/schemas/sqlite_schema.sql   | 1 +
 9 files changed, 14 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index cf611ca951..d646e200a3 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -936,6 +936,9 @@ function database_update_info()
 				GROUPS_TABLE		=> array(
 					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
 				),
+				PROFILE_FIELDS_TABLE	=> array(
+					'field_show_on_pm'		=> array('BOOL', 0),
+				),
 			),
 			'change_columns'	=> array(
 				GROUPS_TABLE		=> array(
@@ -1962,6 +1965,9 @@ function change_database_data(&$no_updates, $version)
 
 			_add_modules($modules_to_install);
 
+			// Allow custom profile fields in pm templates
+			set_config('load_cpf_pm', '0');
+
 			$no_updates = false;
 		break;
 	}
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index e16b4ab64c..73b9a283de 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -793,6 +793,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_validation VARCHAR(20) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	field_required INTEGER DEFAULT 0 NOT NULL,
 	field_show_on_reg INTEGER DEFAULT 0 NOT NULL,
+	field_show_on_pm INTEGER DEFAULT 0 NOT NULL,
 	field_show_on_vt INTEGER DEFAULT 0 NOT NULL,
 	field_show_profile INTEGER DEFAULT 0 NOT NULL,
 	field_hide INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index a14e246c8f..f73f0134db 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -950,6 +950,7 @@ CREATE TABLE [phpbb_profile_fields] (
 	[field_validation] [varchar] (20) DEFAULT ('') NOT NULL ,
 	[field_required] [int] DEFAULT (0) NOT NULL ,
 	[field_show_on_reg] [int] DEFAULT (0) NOT NULL ,
+	[field_show_on_pm] [int] DEFAULT (0) NOT NULL ,
 	[field_show_on_vt] [int] DEFAULT (0) NOT NULL ,
 	[field_show_profile] [int] DEFAULT (0) NOT NULL ,
 	[field_hide] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 3b79afa942..6da9a71420 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -557,6 +557,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_validation varbinary(60) DEFAULT '' NOT NULL,
 	field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	field_show_on_pm tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_vt tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_profile tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_hide tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index a4b34c05db..743105e485 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -557,6 +557,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_validation varchar(20) DEFAULT '' NOT NULL,
 	field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	field_show_on_pm tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_vt tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_profile tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_hide tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 9b516b4a56..13c7303a0d 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1064,6 +1064,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_validation varchar2(60) DEFAULT '' ,
 	field_required number(1) DEFAULT '0' NOT NULL,
 	field_show_on_reg number(1) DEFAULT '0' NOT NULL,
+	field_show_on_pm number(1) DEFAULT '0' NOT NULL,
 	field_show_on_vt number(1) DEFAULT '0' NOT NULL,
 	field_show_profile number(1) DEFAULT '0' NOT NULL,
 	field_hide number(1) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 1b9c1a75aa..d2634c7d40 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -744,6 +744,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_validation varchar(20) DEFAULT '' NOT NULL,
 	field_required INT2 DEFAULT '0' NOT NULL CHECK (field_required >= 0),
 	field_show_on_reg INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_reg >= 0),
+	field_show_on_pm INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_pm >= 0),
 	field_show_on_vt INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_vt >= 0),
 	field_show_profile INT2 DEFAULT '0' NOT NULL CHECK (field_show_profile >= 0),
 	field_hide INT2 DEFAULT '0' NOT NULL CHECK (field_hide >= 0),
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index f3259b8fe3..76bb6fd6cb 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -157,6 +157,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_search_load'
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_anon_lastread', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_birthdays', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_memberlist', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_profile', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewprofile', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', '1');
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 9344a29929..0c706d67dd 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -540,6 +540,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_validation varchar(20) NOT NULL DEFAULT '',
 	field_required INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_show_on_reg INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	field_show_on_pm INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_show_on_vt INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_show_profile INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_hide INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
cgit v1.2.1


From fc9b12669145f72414eb45bbb73860099c6cecef Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 10 Jun 2011 11:06:29 +0200
Subject: [ticket/9992] Make sql_create_table and sql_table_exists available in
 updater

These are defined the same way in db_tools. This duplicated code should be
removed together with the rest of the db_tools duplication at some point.

PHPBB3-9992
---
 phpBB/install/database_update.php | 254 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 254 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 3d32a82cc6..77b5f44502 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2225,6 +2225,260 @@ class updater_db_tools
 		}
 	}
 
+	/**
+	* Check if table exists
+	*
+	*
+	* @param string	$table_name	The table name to check for
+	* @return bool true if table exists, else false
+	*/
+	function sql_table_exists($table_name)
+	{
+		$this->db->sql_return_on_error(true);
+		$result = $this->db->sql_query_limit('SELECT * FROM ' . $table_name, 1);
+		$this->db->sql_return_on_error(false);
+
+		if ($result)
+		{
+			$this->db->sql_freeresult($result);
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Create SQL Table
+	*
+	* @param string	$table_name	The table name to create
+	* @param array	$table_data	Array containing table data.
+	* @return array	Statements if $return_statements is true.
+	*/
+	function sql_create_table($table_name, $table_data)
+	{
+		// holds the DDL for a column
+		$columns = $statements = array();
+
+		if ($this->sql_table_exists($table_name))
+		{
+			return $this->_sql_run_sql($statements);
+		}
+
+		// Begin transaction
+		$statements[] = 'begin';
+
+		// Determine if we have created a PRIMARY KEY in the earliest
+		$primary_key_gen = false;
+
+		// Determine if the table must be created with TEXTIMAGE
+		$create_textimage = false;
+
+		// Determine if the table requires a sequence
+		$create_sequence = false;
+
+		// Begin table sql statement
+		switch ($this->sql_layer)
+		{
+			case 'mssql':
+			case 'mssqlnative':
+				$table_sql = 'CREATE TABLE [' . $table_name . '] (' . "\n";
+			break;
+
+			default:
+				$table_sql = 'CREATE TABLE ' . $table_name . ' (' . "\n";
+			break;
+		}
+
+		// Iterate through the columns to create a table
+		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
+		{
+			// here lies an array, filled with information compiled on the column's data
+			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
+
+			// here we add the definition of the new column to the list of columns
+			switch ($this->sql_layer)
+			{
+				case 'mssql':
+				case 'mssqlnative':
+					$columns[] = "\t [{$column_name}] " . $prepared_column['column_type_sql_default'];
+				break;
+
+				default:
+					$columns[] = "\t {$column_name} " . $prepared_column['column_type_sql'];
+				break;
+			}
+
+			// see if we have found a primary key set due to a column definition if we have found it, we can stop looking
+			if (!$primary_key_gen)
+			{
+				$primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set'];
+			}
+
+			// create textimage DDL based off of the existance of certain column types
+			if (!$create_textimage)
+			{
+				$create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage'];
+			}
+
+			// create sequence DDL based off of the existance of auto incrementing columns
+			if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'])
+			{
+				$create_sequence = $column_name;
+			}
+		}
+
+		// this makes up all the columns in the create table statement
+		$table_sql .= implode(",\n", $columns);
+
+		// Close the table for two DBMS and add to the statements
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+			break;
+
+			case 'mssql':
+			case 'mssqlnative':
+				$table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '');
+				$statements[] = $table_sql;
+			break;
+		}
+
+		// we have yet to create a primary key for this table,
+		// this means that we can add the one we really wanted instead
+		if (!$primary_key_gen)
+		{
+			// Write primary key
+			if (isset($table_data['PRIMARY_KEY']))
+			{
+				if (!is_array($table_data['PRIMARY_KEY']))
+				{
+					$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
+				}
+
+				switch ($this->sql_layer)
+				{
+					case 'mysql_40':
+					case 'mysql_41':
+					case 'postgres':
+					case 'sqlite':
+						$table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
+					break;
+
+					case 'firebird':
+					case 'mssql':
+					case 'mssqlnative':
+						// We need the data here
+						$old_return_statements = $this->return_statements;
+						$this->return_statements = true;
+
+						$primary_key_stmts = $this->sql_create_primary_key($table_name, $table_data['PRIMARY_KEY']);
+						foreach ($primary_key_stmts as $pk_stmt)
+						{
+							$statements[] = $pk_stmt;
+						}
+
+						$this->return_statements = $old_return_statements;
+					break;
+
+					case 'oracle':
+						$table_sql .= ",\n\t CONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
+					break;
+				}
+			}
+		}
+
+		// close the table
+		switch ($this->sql_layer)
+		{
+			case 'mysql_41':
+				// make sure the table is in UTF-8 mode
+				$table_sql .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;";
+				$statements[] = $table_sql;
+			break;
+
+			case 'mysql_40':
+			case 'sqlite':
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+			break;
+
+			case 'postgres':
+				// do we need to add a sequence for auto incrementing columns?
+				if ($create_sequence)
+				{
+					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
+				}
+
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+			break;
+
+			case 'oracle':
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+
+				// do we need to add a sequence and a tigger for auto incrementing columns?
+				if ($create_sequence)
+				{
+					// create the actual sequence
+					$statements[] = "CREATE SEQUENCE {$table_name}_seq";
+
+					// the trigger is the mechanism by which we increment the counter
+					$trigger = "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
+					$trigger .= "BEFORE INSERT ON {$table_name}\n";
+					$trigger .= "FOR EACH ROW WHEN (\n";
+					$trigger .= "\tnew.{$create_sequence} IS NULL OR new.{$create_sequence} = 0\n";
+					$trigger .= ")\n";
+					$trigger .= "BEGIN\n";
+					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
+					$trigger .= "\tINTO :new.{$create_sequence}\n";
+					$trigger .= "\tFROM dual\n";
+					$trigger .= "END;";
+
+					$statements[] = $trigger;
+				}
+			break;
+
+			case 'firebird':
+				if ($create_sequence)
+				{
+					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
+				}
+			break;
+		}
+
+		// Write Keys
+		if (isset($table_data['KEYS']))
+		{
+			foreach ($table_data['KEYS'] as $key_name => $key_data)
+			{
+				if (!is_array($key_data[1]))
+				{
+					$key_data[1] = array($key_data[1]);
+				}
+
+				$old_return_statements = $this->return_statements;
+				$this->return_statements = true;
+
+				$key_stmts = ($key_data[0] == 'UNIQUE') ? $this->sql_create_unique_index($table_name, $key_name, $key_data[1]) : $this->sql_create_index($table_name, $key_name, $key_data[1]);
+
+				foreach ($key_stmts as $key_stmt)
+				{
+					$statements[] = $key_stmt;
+				}
+
+				$this->return_statements = $old_return_statements;
+			}
+		}
+
+		// Commit Transaction
+		$statements[] = 'commit';
+
+		return $this->_sql_run_sql($statements);
+	}
+
 	/**
 	* Handle passed database update array.
 	* Expected structure...
-- 
cgit v1.2.1


From 2dee57fd43ebe1cf1f43fb0161cdd5f072eeaa63 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 10 Jun 2011 12:02:59 +0200
Subject: [ticket/9992] Adding a limit on login attempts per IP.

A new table was created to save all failed login attempts with
corresponding information on username, ip and useragent. By default
the limit is 50 login attempts within 6 hours per IP. The limit is
relatively high to avoid big problems on sites behind a reverse
proxy that don't receive the forwarded-for value as REMOTE_ADDR but
see all users as coming from the same IP address. But if these
users run into problems a special forwarded-for option is available
to limit logins by forwarded-for value instead of ip.

PHPBB3-9992
---
 phpBB/install/database_update.php         | 39 +++++++++++++++++++++++++++-
 phpBB/install/schemas/firebird_schema.sql | 32 ++++++++++++++++++++++-
 phpBB/install/schemas/mssql_schema.sql    | 38 ++++++++++++++++++++++++++-
 phpBB/install/schemas/mysql_40_schema.sql | 20 +++++++++++++-
 phpBB/install/schemas/mysql_41_schema.sql | 20 +++++++++++++-
 phpBB/install/schemas/oracle_schema.sql   | 43 ++++++++++++++++++++++++++++++-
 phpBB/install/schemas/postgres_schema.sql | 24 ++++++++++++++++-
 phpBB/install/schemas/schema_data.sql     |  3 +++
 phpBB/install/schemas/sqlite_schema.sql   | 19 +++++++++++++-
 9 files changed, 230 insertions(+), 8 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 77b5f44502..24a69ab99b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -916,9 +916,29 @@ function database_update_info()
 		'3.0.7-PL1'		=> array(),
 		// No changes from 3.0.8-RC1 to 3.0.8
 		'3.0.8-RC1'		=> array(),
-
 		// Changes from 3.0.8 to 3.0.9-RC1
 		'3.0.8'			=> array(
+			'add_tables'		=> array(
+				LOGIN_ATTEMPT_TABLE	=> array(
+					'COLUMNS'			=> array(
+						'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+						'attempt_ip'			=> array('VCHAR:40', ''),
+						'attempt_browser'		=> array('VCHAR:150', ''),
+						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+						'attempt_time'			=> array('TIMESTAMP', 0),
+						'user_id'				=> array('UINT', 0),
+						'username'				=> array('VCHAR_UNI:255', 0),
+						'username_clean'		=> array('VCHAR_CI', 0),
+					),
+					'PRIMARY_KEY'		=> 'attempt_id',
+					'KEYS'				=> array(
+						'attempt_ip'			=> array('INDEX', array('attempt_ip', 'attempt_time')),
+						'attempt_forwarded_for'	=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+						'attempt_time'			=> array('INDEX', array('attempt_time')),
+						'user_id'				=> array('INDEX', 'user_id'),
+					),
+				),
+			),
 			'change_columns'	=> array(
 				BBCODES_TABLE	=> array(
 					'bbcode_id'	=> array('USINT', 0),
@@ -1870,6 +1890,10 @@ function change_database_data(&$no_updates, $version)
 
 		// Changes from 3.0.8 to 3.0.9-RC1
 		case '3.0.8':
+			set_config('ip_login_limit_max', '50');
+			set_config('ip_login_limit_time', '21600');
+			set_config('ip_login_limit_use_forwarded', '0');
+
 			// Update file extension group names to use language strings, again.
 			$sql = 'SELECT group_id, group_name
 				FROM ' . EXTENSION_GROUPS_TABLE . '
@@ -2516,6 +2540,19 @@ class updater_db_tools
 			$sqlite = true;
 		}
 
+		// Add tables?
+		if (!empty($schema_changes['add_tables']))
+		{
+			foreach ($schema_changes['add_tables'] as $table => $table_data)
+			{
+				$result = $this->sql_create_table($table, $table_data);
+				if ($this->return_statements)
+				{
+					$statements = array_merge($statements, $result);
+				}
+			}
+		}
+
 		// Change columns?
 		if (!empty($schema_changes['change_columns']))
 		{
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 85f86781de..24ebd0f1af 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: $
 #
 
 
@@ -545,6 +545,36 @@ BEGIN
 END;;
 
 
+# Table: 'phpbb_login_attempts'
+CREATE TABLE phpbb_login_attempts (
+	attempt_id INTEGER NOT NULL,
+	attempt_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	attempt_browser VARCHAR(150) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	attempt_forwarded_for VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	attempt_time INTEGER DEFAULT 0 NOT NULL,
+	user_id INTEGER DEFAULT 0 NOT NULL,
+	username VARCHAR(255) CHARACTER SET UTF8 DEFAULT 0 NOT NULL COLLATE UNICODE,
+	username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT 0 NOT NULL COLLATE UNICODE
+);;
+
+ALTER TABLE phpbb_login_attempts ADD PRIMARY KEY (attempt_id);;
+
+CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts(attempt_ip, attempt_time);;
+CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);;
+CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts(attempt_time);;
+CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
+
+CREATE GENERATOR phpbb_login_attempts_gen;;
+SET GENERATOR phpbb_login_attempts_gen TO 0;;
+
+CREATE TRIGGER t_phpbb_login_attempts FOR phpbb_login_attempts
+BEFORE INSERT
+AS
+BEGIN
+	NEW.attempt_id = GEN_ID(phpbb_login_attempts_gen, 1);
+END;;
+
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 0827b14cc2..dbbd144aa0 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1,6 +1,6 @@
 /*
 
- $Id$
+ $Id: $
 
 */
 
@@ -649,6 +649,41 @@ CREATE  INDEX [user_id] ON [phpbb_log]([user_id]) ON [PRIMARY]
 GO
 
 
+/*
+	Table: 'phpbb_login_attempts'
+*/
+CREATE TABLE [phpbb_login_attempts] (
+	[attempt_id] [int] IDENTITY (1, 1) NOT NULL ,
+	[attempt_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
+	[attempt_browser] [varchar] (150) DEFAULT ('') NOT NULL ,
+	[attempt_forwarded_for] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[attempt_time] [int] DEFAULT (0) NOT NULL ,
+	[user_id] [int] DEFAULT (0) NOT NULL ,
+	[username] [varchar] (255) DEFAULT (0) NOT NULL ,
+	[username_clean] [varchar] (255) DEFAULT (0) NOT NULL 
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD 
+	CONSTRAINT [PK_phpbb_login_attempts] PRIMARY KEY  CLUSTERED 
+	(
+		[attempt_id]
+	)  ON [PRIMARY] 
+GO
+
+CREATE  INDEX [attempt_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [attempt_forwarded_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [attempt_time] ON [phpbb_login_attempts]([attempt_time]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY]
+GO
+
+
 /*
 	Table: 'phpbb_moderator_cache'
 */
@@ -1730,3 +1765,4 @@ ALTER TABLE [phpbb_zebra] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
+
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index eeaec4ccf6..bce04eedfb 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: $
 #
 
 # Table: 'phpbb_attachments'
@@ -369,6 +369,24 @@ CREATE TABLE phpbb_log (
 );
 
 
+# Table: 'phpbb_login_attempts'
+CREATE TABLE phpbb_login_attempts (
+	attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
+	attempt_ip varbinary(40) DEFAULT '' NOT NULL,
+	attempt_browser varbinary(150) DEFAULT '' NOT NULL,
+	attempt_forwarded_for varbinary(255) DEFAULT '' NOT NULL,
+	attempt_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	username blob NOT NULL,
+	username_clean blob NOT NULL,
+	PRIMARY KEY (attempt_id),
+	KEY attempt_ip (attempt_ip, attempt_time),
+	KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time),
+	KEY attempt_time (attempt_time),
+	KEY user_id (user_id)
+);
+
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 3a3b4ab2fd..e77ad44dd8 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: $
 #
 
 # Table: 'phpbb_attachments'
@@ -369,6 +369,24 @@ CREATE TABLE phpbb_log (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
+# Table: 'phpbb_login_attempts'
+CREATE TABLE phpbb_login_attempts (
+	attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
+	attempt_ip varchar(40) DEFAULT '' NOT NULL,
+	attempt_browser varchar(150) DEFAULT '' NOT NULL,
+	attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
+	attempt_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	username varchar(255) DEFAULT '0' NOT NULL,
+	username_clean varchar(255) DEFAULT '0' NOT NULL,
+	PRIMARY KEY (attempt_id),
+	KEY attempt_ip (attempt_ip, attempt_time),
+	KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time),
+	KEY attempt_time (attempt_time),
+	KEY user_id (user_id)
+) CHARACTER SET `utf8` COLLATE `utf8_bin`;
+
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_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 9c25af2512..5a1e4930b2 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1,6 +1,6 @@
 /*
 
- $Id$
+ $Id: $
 
 */
 
@@ -740,6 +740,47 @@ END;
 /
 
 
+/*
+	Table: 'phpbb_login_attempts'
+*/
+CREATE TABLE phpbb_login_attempts (
+	attempt_id number(8) NOT NULL,
+	attempt_ip varchar2(40) DEFAULT '' ,
+	attempt_browser varchar2(150) DEFAULT '' ,
+	attempt_forwarded_for varchar2(255) DEFAULT '' ,
+	attempt_time number(11) DEFAULT '0' NOT NULL,
+	user_id number(8) DEFAULT '0' NOT NULL,
+	username varchar2(765) DEFAULT '0' NOT NULL,
+	username_clean varchar2(255) DEFAULT '0' NOT NULL,
+	CONSTRAINT pk_phpbb_login_attempts PRIMARY KEY (attempt_id)
+)
+/
+
+CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time)
+/
+CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time)
+/
+CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time)
+/
+CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
+/
+
+CREATE SEQUENCE phpbb_login_attempts_seq
+/
+
+CREATE OR REPLACE TRIGGER t_phpbb_login_attempts
+BEFORE INSERT ON phpbb_login_attempts
+FOR EACH ROW WHEN (
+	new.attempt_id IS NULL OR new.attempt_id = 0
+)
+BEGIN
+	SELECT phpbb_login_attempts_seq.nextval
+	INTO :new.attempt_id
+	FROM dual;
+END;
+/
+
+
 /*
 	Table: 'phpbb_moderator_cache'
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index a2d4dc3e0b..c4c2307c3a 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1,6 +1,6 @@
 /*
 
- $Id$
+ $Id: $
 
 */
 
@@ -524,6 +524,28 @@ CREATE INDEX phpbb_log_topic_id ON phpbb_log (topic_id);
 CREATE INDEX phpbb_log_reportee_id ON phpbb_log (reportee_id);
 CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
 
+/*
+	Table: 'phpbb_login_attempts'
+*/
+CREATE SEQUENCE phpbb_login_attempts_seq;
+
+CREATE TABLE phpbb_login_attempts (
+	attempt_id INT4 DEFAULT nextval('phpbb_login_attempts_seq'),
+	attempt_ip varchar(40) DEFAULT '' NOT NULL,
+	attempt_browser varchar(150) DEFAULT '' NOT NULL,
+	attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
+	attempt_time INT4 DEFAULT '0' NOT NULL CHECK (attempt_time >= 0),
+	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
+	username varchar(255) DEFAULT '0' NOT NULL,
+	username_clean varchar_ci DEFAULT '0' NOT NULL,
+	PRIMARY KEY (attempt_id)
+);
+
+CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
+CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
+CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time);
+CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
+
 /*
 	Table: 'phpbb_moderator_cache'
 */
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index ea4157d6a3..08d6c18ee8 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -136,6 +136,9 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_thumb_widt
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_width', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_min_thumb_filesize', '12000');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_max', '50');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_time', '21600');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_use_forwarded', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_enable', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_host', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_password', '');
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 8661bb7578..9668c8d5f1 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: $
 #
 
 BEGIN TRANSACTION;
@@ -357,6 +357,23 @@ CREATE INDEX phpbb_log_topic_id ON phpbb_log (topic_id);
 CREATE INDEX phpbb_log_reportee_id ON phpbb_log (reportee_id);
 CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
 
+# Table: 'phpbb_login_attempts'
+CREATE TABLE phpbb_login_attempts (
+	attempt_id INTEGER PRIMARY KEY NOT NULL ,
+	attempt_ip varchar(40) NOT NULL DEFAULT '',
+	attempt_browser varchar(150) NOT NULL DEFAULT '',
+	attempt_forwarded_for varchar(255) NOT NULL DEFAULT '',
+	attempt_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	username varchar(255) NOT NULL DEFAULT '0',
+	username_clean varchar(255) NOT NULL DEFAULT '0'
+);
+
+CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
+CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
+CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time);
+CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
cgit v1.2.1


From 418c3d546a5ea29b5ce338e4710e0d3636009733 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 01:21:55 +0200
Subject: [ticket/9892] column & index name limits, firebird auto increment in
 db_tools

- Column names are limited to 30 characters
- Index names are limited to 31 characters.
  On some dbms the index name contains both table name and actual index name
  so the limit applies to the sum of the lenghts of table name and index name.
- Auto incremented column names are limited to 26 characters to provide an
  additional 4 characters for sequence names

The code for firebird auto increment support using generators/sequences with
triggers was copied from create_schema_files.php

PHPBB3-9892
---
 phpBB/install/database_update.php | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 24a69ab99b..1abd91e27f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2319,6 +2319,11 @@ class updater_db_tools
 			// here lies an array, filled with information compiled on the column's data
 			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
 
+			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
+			{
+				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			}
+
 			// here we add the definition of the new column to the list of columns
 			switch ($this->sql_layer)
 			{
@@ -2468,7 +2473,13 @@ class updater_db_tools
 			case 'firebird':
 				if ($create_sequence)
 				{
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
+					$statements[] = "CREATE GENERATOR {$table_name}_gen;";
+					$statements[] = "SET GENERATOR {$table_name}_gen TO 0;";
+
+					$trigger = "CREATE TRIGGER t_$table_name FOR $table_name\n";
+					$trigger .= "BEFORE INSERT\nAS\nBEGIN\n";
+					$trigger .= "\tNEW.{$create_sequence} = GEN_ID({$table_name}_gen, 1);\nEND;";
+					$statements[] = $trigger;
 				}
 			break;
 		}
@@ -3302,6 +3313,11 @@ class updater_db_tools
 	*/
 	function sql_prepare_column_data($table_name, $column_name, $column_data)
 	{
+		if (strlen($column_name) > 30)
+		{
+			trigger_error("Column name '$column_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+		}
+
 		// Get type
 		if (strpos($column_data[0], ':') !== false)
 		{
@@ -3875,6 +3891,11 @@ class updater_db_tools
 	{
 		$statements = array();
 
+		if (strlen($table_name . $index_name) > 30)
+		{
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+		}
+
 		switch ($this->sql_layer)
 		{
 			case 'firebird':
@@ -3905,6 +3926,11 @@ class updater_db_tools
 	{
 		$statements = array();
 
+		if (strlen($table_name . $index_name) > 30)
+		{
+			trigger_error("Index name '${table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+		}
+
 		// remove index length unless MySQL4
 		if ('mysql_40' != $this->sql_layer)
 		{
-- 
cgit v1.2.1


From ef544ee095f2decde39cc537d3d675642b7c80f2 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 04:10:51 +0200
Subject: [ticket/9892] Table prefix lengths influence index lengths in
 db_tools

PHPBB3-9892
---
 phpBB/install/database_update.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1abd91e27f..7bf41c8450 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2321,7 +2321,7 @@ class updater_db_tools
 
 			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
 			{
-				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR);
 			}
 
 			// here we add the definition of the new column to the list of columns
@@ -3891,9 +3891,11 @@ class updater_db_tools
 	{
 		$statements = array();
 
-		if (strlen($table_name . $index_name) > 30)
+		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
+		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
 		{
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			$max_length = $table_prefix + 24;
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
 		}
 
 		switch ($this->sql_layer)
@@ -3926,9 +3928,11 @@ class updater_db_tools
 	{
 		$statements = array();
 
-		if (strlen($table_name . $index_name) > 30)
+		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
+		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
 		{
-			trigger_error("Index name '${table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			$max_length = $table_prefix + 24;
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
 		}
 
 		// remove index length unless MySQL4
-- 
cgit v1.2.1


From 32f37bf938efe7a85b72ad2429e715269abc6fee Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 10:49:48 +0200
Subject: [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state

PHPBB3-9892
---
 phpBB/install/database_update.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7bf41c8450..dce77a67d7 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1913,6 +1913,30 @@ function change_database_data(&$no_updates, $version)
 			}
 			$db->sql_freeresult($result);
 
+			global $db_tools;
+
+			// Recover from potentially broken Q&A CAPTCHA table on firebird
+			if ($db_tools->sql_layer == 'firebird')
+			{
+				if ($config['captcha_plugin'] == 'phpbb_captcha_qa')
+				{
+					setconfig('captcha_plugin', 'phpbb_captcha_nogd');
+				}
+
+				$tables = array(
+					$table_prefix . 'captcha_questions',
+					$table_prefix . 'captcha_answers',
+					$table_prefix . 'qa_confirm',
+				);
+				foreach ($tables as $table)
+				{
+					if ($db_tools->sql_table_exists($table))
+					{
+						$db_tools->sql_table_drop($table);
+					}
+				}
+			}
+
 			$no_updates = false;
 		break;
 	}
-- 
cgit v1.2.1


From 6cab45b28e5c30571ce6f2961e26d268fb6542e7 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 11:02:30 +0200
Subject: [ticket/9892] Shorten login_attempt key names to avoid firebird
 length problems

PHPBB3-9892
---
 phpBB/install/database_update.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index dce77a67d7..7cf3b02e9f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -932,9 +932,9 @@ function database_update_info()
 					),
 					'PRIMARY_KEY'		=> 'attempt_id',
 					'KEYS'				=> array(
-						'attempt_ip'			=> array('INDEX', array('attempt_ip', 'attempt_time')),
-						'attempt_forwarded_for'	=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-						'attempt_time'			=> array('INDEX', array('attempt_time')),
+						'att_ip'			=> array('INDEX', array('attempt_ip', 'attempt_time')),
+						'att_for'	=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+						'att_time'			=> array('INDEX', array('attempt_time')),
 						'user_id'				=> array('INDEX', 'user_id'),
 					),
 				),
-- 
cgit v1.2.1


From cd3d23810f844b529f304cb7062ffe65cc17e4e3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 11:06:52 +0200
Subject: [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to
 change config

PHPBB3-9892
---
 phpBB/install/database_update.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7cf3b02e9f..7d7572b204 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1913,16 +1913,13 @@ function change_database_data(&$no_updates, $version)
 			}
 			$db->sql_freeresult($result);
 
-			global $db_tools;
+			global $db_tools, $table_prefix;
 
 			// Recover from potentially broken Q&A CAPTCHA table on firebird
+			// Q&A CAPTCHA was uninstallable, so it's safe to remove these
+			// without data loss
 			if ($db_tools->sql_layer == 'firebird')
 			{
-				if ($config['captcha_plugin'] == 'phpbb_captcha_qa')
-				{
-					setconfig('captcha_plugin', 'phpbb_captcha_nogd');
-				}
-
 				$tables = array(
 					$table_prefix . 'captcha_questions',
 					$table_prefix . 'captcha_answers',
-- 
cgit v1.2.1


From 2569d7460ae8ba771b840f437c3846fc1f2c3e07 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 11:40:57 +0200
Subject: [ticket/9892] Transaction support for database update sql execution
 function

Updates would fail before because 'begin' as generated by
db_tools::sql_create_table would be executed literally.

PHPBB3-9892
---
 phpBB/install/database_update.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7d7572b204..5bc856250b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -534,12 +534,23 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
 
 	$db->sql_return_on_error(true);
 
-	$result = $db->sql_query($sql);
-	if ($db->sql_error_triggered)
+	if ($sql === 'begin')
+	{
+		$db->sql_transaction('begin');
+	}
+	else if ($sql === 'commit')
 	{
-		$errored = true;
-		$error_ary['sql'][] = $db->sql_error_sql;
-		$error_ary['error_code'][] = $db->sql_error_returned;
+		$db->sql_transaction('commit');
+	}
+	else
+	{
+		$result = $db->sql_query($sql);
+		if ($db->sql_error_triggered)
+		{
+			$errored = true;
+			$error_ary['sql'][] = $db->sql_error_sql;
+			$error_ary['error_code'][] = $db->sql_error_returned;
+		}
 	}
 
 	$db->sql_return_on_error(false);
-- 
cgit v1.2.1


From b774520621e5508365984a890e1b9c2375c201c3 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 11 Jun 2011 02:20:48 +0200
Subject: [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9
 releases.

---
 phpBB/install/convertors/convert_phpbb20.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index b6eee8d621..7f6e3c0250 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -32,7 +32,7 @@ unset($dbpasswd);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.0.8',
+	'phpbb_version'	=> '3.0.9',
 	'author'		=> '<a href="http://www.phpbb.com/">phpBB Group</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
-- 
cgit v1.2.1


From 7232ca4102f7af992abe80037c3414f4d6b7768d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 11 Jun 2011 02:29:11 +0200
Subject: [develop-olympus] Bumping version number for 3.0.9-RC1.

---
 phpBB/install/database_update.php     | 2 +-
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 5bc856250b..92fadd0853 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.9-dev';
+$updates_to_version = '3.0.9-RC1';
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 08d6c18ee8..52f9a94746 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-RC1');
 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');
 
-- 
cgit v1.2.1


From b65cf4c8d6f4d97f9db6dbb612072b3a999158da Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 23:09:52 +0200
Subject: [ticket/9992] The table name constant needs to be defined in the
 updater

When the database update is run before updating the files the constant
is not yet defined.

PHPBB3-9992
---
 phpBB/install/database_update.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 24a69ab99b..935fe70b9c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -78,6 +78,13 @@ require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
+// new table constants are separately defined here in case the updater is run
+// before the files are updated
+if (!defined('LOGIN_ATTEMPT_TABLE'))
+{
+	define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts');
+}
+
 // If we are on PHP >= 6.0.0 we do not need some code
 if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
 {
-- 
cgit v1.2.1


From c9e22ac5098d0ff6c66256965f16daa7511e3e58 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 23:45:23 +0200
Subject: [ticket/9892] _sql in the updater needs to return the transaction
 results

PHPBB3-9892
---
 phpBB/install/database_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 5bc856250b..c3f22df530 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -536,11 +536,11 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
 
 	if ($sql === 'begin')
 	{
-		$db->sql_transaction('begin');
+		$result = $db->sql_transaction('begin');
 	}
 	else if ($sql === 'commit')
 	{
-		$db->sql_transaction('commit');
+		$result = $db->sql_transaction('commit');
 	}
 	else
 	{
-- 
cgit v1.2.1


From 47edadfc9e1b4788975910ad474cc2b806024ce3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 13 Jun 2011 01:52:18 +0200
Subject: [ticket/10213] Update install schema with shorter index names.

PHPBB3-10213
---
 phpBB/install/schemas/firebird_schema.sql | 6 +++---
 phpBB/install/schemas/mssql_schema.sql    | 6 +++---
 phpBB/install/schemas/mysql_40_schema.sql | 6 +++---
 phpBB/install/schemas/mysql_41_schema.sql | 6 +++---
 phpBB/install/schemas/oracle_schema.sql   | 6 +++---
 phpBB/install/schemas/postgres_schema.sql | 6 +++---
 phpBB/install/schemas/sqlite_schema.sql   | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 24ebd0f1af..5df7dfe9a5 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -559,9 +559,9 @@ CREATE TABLE phpbb_login_attempts (
 
 ALTER TABLE phpbb_login_attempts ADD PRIMARY KEY (attempt_id);;
 
-CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts(attempt_ip, attempt_time);;
-CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);;
-CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts(attempt_time);;
+CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts(attempt_ip, attempt_time);;
+CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);;
+CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts(attempt_time);;
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
 
 CREATE GENERATOR phpbb_login_attempts_gen;;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index dbbd144aa0..0bc76c05e6 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -671,13 +671,13 @@ ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  INDEX [attempt_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY]
+CREATE  INDEX [att_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [attempt_forwarded_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time]) ON [PRIMARY]
+CREATE  INDEX [att_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [attempt_time] ON [phpbb_login_attempts]([attempt_time]) ON [PRIMARY]
+CREATE  INDEX [att_time] ON [phpbb_login_attempts]([attempt_time]) ON [PRIMARY]
 GO
 
 CREATE  INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY]
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index bce04eedfb..6b13485a3d 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -380,9 +380,9 @@ CREATE TABLE phpbb_login_attempts (
 	username blob NOT NULL,
 	username_clean blob NOT NULL,
 	PRIMARY KEY (attempt_id),
-	KEY attempt_ip (attempt_ip, attempt_time),
-	KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time),
-	KEY attempt_time (attempt_time),
+	KEY att_ip (attempt_ip, attempt_time),
+	KEY att_for (attempt_forwarded_for, attempt_time),
+	KEY att_time (attempt_time),
 	KEY user_id (user_id)
 );
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index e77ad44dd8..b400e8fcff 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -380,9 +380,9 @@ CREATE TABLE phpbb_login_attempts (
 	username varchar(255) DEFAULT '0' NOT NULL,
 	username_clean varchar(255) DEFAULT '0' NOT NULL,
 	PRIMARY KEY (attempt_id),
-	KEY attempt_ip (attempt_ip, attempt_time),
-	KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time),
-	KEY attempt_time (attempt_time),
+	KEY att_ip (attempt_ip, attempt_time),
+	KEY att_for (attempt_forwarded_for, attempt_time),
+	KEY att_time (attempt_time),
 	KEY user_id (user_id)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 5a1e4930b2..8c79e870cb 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -756,11 +756,11 @@ CREATE TABLE phpbb_login_attempts (
 )
 /
 
-CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time)
+CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time)
 /
-CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time)
+CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time)
 /
-CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time)
+CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time)
 /
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index c4c2307c3a..359ec325d7 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -541,9 +541,9 @@ CREATE TABLE phpbb_login_attempts (
 	PRIMARY KEY (attempt_id)
 );
 
-CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
-CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
-CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time);
+CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
+CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
+CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time);
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
 
 /*
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 9668c8d5f1..3158c1a177 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -369,9 +369,9 @@ CREATE TABLE phpbb_login_attempts (
 	username_clean varchar(255) NOT NULL DEFAULT '0'
 );
 
-CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
-CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
-CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time);
+CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
+CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
+CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time);
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
 
 # Table: 'phpbb_moderator_cache'
-- 
cgit v1.2.1


From c090e1c9e9fc2e435a4ae2f63923955d66dccd6d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 13 Jun 2011 06:14:59 +0200
Subject: [ticket/10214] Correct Oracle create table query syntax in db_tools

Removes the semicolon at end of oracle CREATE TABLE queries and adds a
semicolon to the end of a SELECT query inside of the trigger for a new
table's auto increment column before the end keyword

PHPBB3-10214
---
 phpBB/install/database_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 75b8644105..504d9afd68 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2484,7 +2484,7 @@ class updater_db_tools
 			break;
 
 			case 'oracle':
-				$table_sql .= "\n);";
+				$table_sql .= "\n)";
 				$statements[] = $table_sql;
 
 				// do we need to add a sequence and a tigger for auto incrementing columns?
@@ -2502,7 +2502,7 @@ class updater_db_tools
 					$trigger .= "BEGIN\n";
 					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
 					$trigger .= "\tINTO :new.{$create_sequence}\n";
-					$trigger .= "\tFROM dual\n";
+					$trigger .= "\tFROM dual;\n";
 					$trigger .= "END;";
 
 					$statements[] = $trigger;
-- 
cgit v1.2.1


From bf61602a285bce86cb4f26c2155fd781fb09f7c5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 13 Jun 2011 22:23:28 +0200
Subject: [develop-olympus] Incrementing the version to 3.0.10-dev in
 develop-olympus.

---
 phpBB/install/database_update.php     | 2 +-
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 504d9afd68..f3586a5087 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.9-RC1';
+$updates_to_version = '3.0.10-dev';
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 52f9a94746..153ac61157 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10-dev');
 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');
 
-- 
cgit v1.2.1


From f8eb15471488fe5f84669a9abbc2fc3a705903de Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Tue, 14 Jun 2011 06:11:35 -0400
Subject: [ticket/10218] Moving global deregistration, etc. to startup.php

Because startup.php deletes all variables, the constants in
database_update are used to preserve settings at the top.

PHPBB3-10218
---
 phpBB/install/database_update.php | 36 +++++---------
 phpBB/install/index.php           | 99 +--------------------------------------
 2 files changed, 14 insertions(+), 121 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 504d9afd68..478ec36c23 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,17 +8,21 @@
 *
 */
 
-$updates_to_version = '3.0.9-RC1';
+define('UPDATES_TO_VERSION', '3.0.9-RC1');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
-$debug_from_version = false;
+define('DEBUG_FROM_VERSION', false);
 
 // Which oldest version does this updater support?
-$oldest_from_version = '3.0.0';
+define('OLDEST_FROM_VERSION', '3.0.0');
 
 // Return if we "just include it" to find out for which version the database update is responsible for
 if (defined('IN_PHPBB') && defined('IN_INSTALL'))
 {
+	$updates_to_version = UPDATES_TO_VERSION;
+	$debug_from_version = DEBUG_FROM_VERSION;
+	$oldest_from_version = OLDEST_FROM_VERSION;
+
 	return;
 }
 
@@ -30,12 +34,12 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-// Report all errors, except notices and deprecation messages
-if (!defined('E_DEPRECATED'))
-{
-	define('E_DEPRECATED', 8192);
-}
-//error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+require($phpbb_root_path . 'includes/startup.' . $phpEx);
+
+$updates_to_version = UPDATES_TO_VERSION;
+$debug_from_version = DEBUG_FROM_VERSION;
+$oldest_from_version = OLDEST_FROM_VERSION;
+
 error_reporting(E_ALL);
 
 @set_time_limit(0);
@@ -85,20 +89,6 @@ if (!defined('LOGIN_ATTEMPT_TABLE'))
 	define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts');
 }
 
-// If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
-{
-	/**
-	* @ignore
-	*/
-	define('STRIP', false);
-}
-else
-{
-	@set_magic_quotes_runtime(0);
-	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
-}
-
 $user = new user();
 $cache = new cache();
 $db = new $sql_db();
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index bace22f177..ff6a297022 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -18,110 +18,13 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-// Report all errors, except notices and deprecation messages
-if (!defined('E_DEPRECATED'))
-{
-	define('E_DEPRECATED', 8192);
-}
-error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
-
 // @todo Review this test and see if we can find out what it is which prevents PHP 4.2.x from even displaying the page with requirements on it
 if (version_compare(PHP_VERSION, '4.3.3') < 0)
 {
 	die('You are running an unsupported PHP version. Please upgrade to PHP 4.3.3 or higher before trying to install phpBB 3.0');
 }
 
-/*
-* Remove variables created by register_globals from the global scope
-* Thanks to Matt Kavanagh
-*/
-function deregister_globals()
-{
-	$not_unset = array(
-		'GLOBALS'	=> true,
-		'_GET'		=> true,
-		'_POST'		=> true,
-		'_COOKIE'	=> true,
-		'_REQUEST'	=> true,
-		'_SERVER'	=> true,
-		'_SESSION'	=> true,
-		'_ENV'		=> true,
-		'_FILES'	=> true,
-		'phpEx'		=> true,
-		'phpbb_root_path'	=> true
-	);
-
-	// Not only will array_merge and array_keys give a warning if
-	// a parameter is not an array, array_merge will actually fail.
-	// So we check if _SESSION has been initialised.
-	if (!isset($_SESSION) || !is_array($_SESSION))
-	{
-		$_SESSION = array();
-	}
-
-	// Merge all into one extremely huge array; unset this later
-	$input = array_merge(
-		array_keys($_GET),
-		array_keys($_POST),
-		array_keys($_COOKIE),
-		array_keys($_SERVER),
-		array_keys($_SESSION),
-		array_keys($_ENV),
-		array_keys($_FILES)
-	);
-
-	foreach ($input as $varname)
-	{
-		if (isset($not_unset[$varname]))
-		{
-			// Hacking attempt. No point in continuing unless it's a COOKIE
-			if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS']))
-			{
-				exit;
-			}
-			else
-			{
-				$cookie = &$_COOKIE;
-				while (isset($cookie['GLOBALS']))
-				{
-					foreach ($cookie['GLOBALS'] as $registered_var => $value)
-					{
-						if (!isset($not_unset[$registered_var]))
-						{
-							unset($GLOBALS[$registered_var]);
-						}
-					}
-					$cookie = &$cookie['GLOBALS'];
-				}
-			}
-		}
-
-		unset($GLOBALS[$varname]);
-	}
-
-	unset($input);
-}
-
-// If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
-{
-	/**
-	* @ignore
-	*/
-	define('STRIP', false);
-}
-else
-{
-	@set_magic_quotes_runtime(0);
-
-	// Be paranoid with passed vars
-	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
-	{
-		deregister_globals();
-	}
-
-	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
-}
+require($phpbb_root_path . 'includes/startup.' . $phpEx);
 
 // Try to override some limits - maybe it helps some...
 @set_time_limit(0);
-- 
cgit v1.2.1


From 48e5e56146bdf1b2b30556e8fb353e7aa20f7fb6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 15 Jun 2011 19:41:14 +0200
Subject: [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.

---
 phpBB/install/database_update.php     | 8 +++++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 478ec36c23..e9213cac9d 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9-RC1');
+define('UPDATES_TO_VERSION', '3.0.9-RC2');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -953,6 +953,8 @@ function database_update_info()
 				),
 			),
 		),
+		// No changes from 3.0.9-RC1 to 3.0.9-RC2
+		'3.0.9-RC1'		=> array(),
 	);
 }
 
@@ -1944,6 +1946,10 @@ function change_database_data(&$no_updates, $version)
 
 			$no_updates = false;
 		break;
+
+		// No changes from 3.0.9-RC1 to 3.0.9-RC2
+		case '3.0.9-RC1':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 52f9a94746..5e8aee85ef 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-RC2');
 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');
 
-- 
cgit v1.2.1


From 1b0821a11baf7e15686dae9c2648878a826be80e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 18 Jun 2011 01:02:58 +0200
Subject: [ticket/10223] requiring the new startup.php file conditionally.

Added a function for this which we can potentially apply to more of the files in the
installer and database updater.

PHPBB3-10223
---
 phpBB/install/database_update.php | 24 +++++++++++++++++++-----
 phpBB/install/index.php           | 24 +++++++++++++++++++-----
 2 files changed, 38 insertions(+), 10 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e9213cac9d..0d424d0d88 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -34,7 +34,24 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-require($phpbb_root_path . 'includes/startup.' . $phpEx);
+function phpbb_require_updated($path, $optional = false)
+{
+    global $phpbb_root_path;
+
+    $new_path = $phpbb_root_path . 'install/update/new/' . $path;
+    $old_path = $phpbb_root_path . $path;
+
+    if (file_exists($new_path))
+    {
+        require($new_path);
+    }
+    else if (file_exists($old_path) || !$optional)
+    {
+        require($old_path);
+    }
+}
+
+phpbb_require_updated('includes/startup.' . $phpEx);
 
 $updates_to_version = UPDATES_TO_VERSION;
 $debug_from_version = DEBUG_FROM_VERSION;
@@ -72,10 +89,7 @@ require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
-if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx))
-{
-	require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
-}
+phpbb_require_updated($phpbb_root_path . 'includes/functions_content.' . $phpEx, true);
 
 require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index ff6a297022..c82c3dbc13 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -24,7 +24,24 @@ if (version_compare(PHP_VERSION, '4.3.3') < 0)
 	die('You are running an unsupported PHP version. Please upgrade to PHP 4.3.3 or higher before trying to install phpBB 3.0');
 }
 
-require($phpbb_root_path . 'includes/startup.' . $phpEx);
+function phpbb_require_updated($path, $optional = false)
+{
+    global $phpbb_root_path;
+
+    $new_path = $phpbb_root_path . 'install/update/new/' . $path;
+    $old_path = $phpbb_root_path . $path;
+
+    if (file_exists($new_path))
+    {
+        require($new_path);
+    }
+    else if (file_exists($old_path) || !$optional)
+    {
+        require($old_path);
+    }
+}
+
+phpbb_require_updated('includes/startup.' . $phpEx);
 
 // Try to override some limits - maybe it helps some...
 @set_time_limit(0);
@@ -57,10 +74,7 @@ else
 // Include essential scripts
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
-if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx))
-{
-	require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
-}
+phpbb_require_updated($phpbb_root_path . 'includes/functions_content.' . $phpEx, true);
 
 include($phpbb_root_path . 'includes/auth.' . $phpEx);
 include($phpbb_root_path . 'includes/session.' . $phpEx);
-- 
cgit v1.2.1


From d3f1b6029248d20d4a3a4bc2f3684f8aad88559d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 18 Jun 2011 23:48:37 +0200
Subject: [ticket/10223] Check optional before file_exists and correct require
 path

PHPBB3-10223
---
 phpBB/install/database_update.php | 4 ++--
 phpBB/install/index.php           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0d424d0d88..337f08b626 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -45,7 +45,7 @@ function phpbb_require_updated($path, $optional = false)
     {
         require($new_path);
     }
-    else if (file_exists($old_path) || !$optional)
+    else if (!$optional || file_exists($old_path))
     {
         require($old_path);
     }
@@ -89,7 +89,7 @@ require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
-phpbb_require_updated($phpbb_root_path . 'includes/functions_content.' . $phpEx, true);
+phpbb_require_updated('includes/functions_content.' . $phpEx, true);
 
 require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index c82c3dbc13..5189cbfc8e 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -35,7 +35,7 @@ function phpbb_require_updated($path, $optional = false)
     {
         require($new_path);
     }
-    else if (file_exists($old_path) || !$optional)
+    else if (!$optional || file_exists($old_path))
     {
         require($old_path);
     }
@@ -74,7 +74,7 @@ else
 // Include essential scripts
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
-phpbb_require_updated($phpbb_root_path . 'includes/functions_content.' . $phpEx, true);
+phpbb_require_updated('includes/functions_content.' . $phpEx, true);
 
 include($phpbb_root_path . 'includes/auth.' . $phpEx);
 include($phpbb_root_path . 'includes/session.' . $phpEx);
-- 
cgit v1.2.1


From 67fde80fbbfc219352ad19124446bb63451306eb Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 19 Jun 2011 23:02:59 +0200
Subject: [ticket/10223] Replace spaces with tabs

PHPBB3-10223
---
 phpBB/install/database_update.php | 26 +++++++++++++-------------
 phpBB/install/index.php           | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 337f08b626..e0901eedb1 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -36,19 +36,19 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
 function phpbb_require_updated($path, $optional = false)
 {
-    global $phpbb_root_path;
-
-    $new_path = $phpbb_root_path . 'install/update/new/' . $path;
-    $old_path = $phpbb_root_path . $path;
-
-    if (file_exists($new_path))
-    {
-        require($new_path);
-    }
-    else if (!$optional || file_exists($old_path))
-    {
-        require($old_path);
-    }
+	global $phpbb_root_path;
+
+	$new_path = $phpbb_root_path . 'install/update/new/' . $path;
+	$old_path = $phpbb_root_path . $path;
+
+	if (file_exists($new_path))
+	{
+		require($new_path);
+	}
+	else if (!$optional || file_exists($old_path))
+	{
+		require($old_path);
+	}
 }
 
 phpbb_require_updated('includes/startup.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 5189cbfc8e..f534980389 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -26,19 +26,19 @@ if (version_compare(PHP_VERSION, '4.3.3') < 0)
 
 function phpbb_require_updated($path, $optional = false)
 {
-    global $phpbb_root_path;
-
-    $new_path = $phpbb_root_path . 'install/update/new/' . $path;
-    $old_path = $phpbb_root_path . $path;
-
-    if (file_exists($new_path))
-    {
-        require($new_path);
-    }
-    else if (!$optional || file_exists($old_path))
-    {
-        require($old_path);
-    }
+	global $phpbb_root_path;
+
+	$new_path = $phpbb_root_path . 'install/update/new/' . $path;
+	$old_path = $phpbb_root_path . $path;
+
+	if (file_exists($new_path))
+	{
+		require($new_path);
+	}
+	else if (!$optional || file_exists($old_path))
+	{
+		require($old_path);
+	}
 }
 
 phpbb_require_updated('includes/startup.' . $phpEx);
-- 
cgit v1.2.1


From ad5ed9d0ee987da29a6d49c42cc3118d4868e539 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 20 Jun 2011 00:00:30 +0200
Subject: [ticket/10223] Make definition of phpbb_require_updated conditional

The automatic updater defines it too and includes database_update.php
for updating which causes an error otherwise.

PHPBB3-10223
---
 phpBB/install/database_update.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e0901eedb1..edfc3b1027 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -34,20 +34,23 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-function phpbb_require_updated($path, $optional = false)
+if (!function_exists('phpbb_require_updated'))
 {
-	global $phpbb_root_path;
+	function phpbb_require_updated($path, $optional = false)
+	{
+		global $phpbb_root_path;
 
-	$new_path = $phpbb_root_path . 'install/update/new/' . $path;
-	$old_path = $phpbb_root_path . $path;
+		$new_path = $phpbb_root_path . 'install/update/new/' . $path;
+		$old_path = $phpbb_root_path . $path;
 
-	if (file_exists($new_path))
-	{
-		require($new_path);
-	}
-	else if (!$optional || file_exists($old_path))
-	{
-		require($old_path);
+		if (file_exists($new_path))
+		{
+			require($new_path);
+		}
+		else if (!$optional || file_exists($old_path))
+		{
+			require($old_path);
+		}
 	}
 }
 
-- 
cgit v1.2.1


From fe0932fdf02a45be914414eca586add1c083cbee Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Jun 2011 20:47:33 +0200
Subject: [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.

---
 phpBB/install/database_update.php     | 6 ++++++
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index edfc3b1027..bfbddf2dc5 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -972,6 +972,8 @@ function database_update_info()
 		),
 		// No changes from 3.0.9-RC1 to 3.0.9-RC2
 		'3.0.9-RC1'		=> array(),
+		// No changes from 3.0.9-RC2 to 3.0.9-RC3
+		'3.0.9-RC2'		=> array(),
 	);
 }
 
@@ -1967,6 +1969,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.9-RC1 to 3.0.9-RC2
 		case '3.0.9-RC1':
 		break;
+
+		// No changes from 3.0.9-RC2 to 3.0.9-RC3
+		case '3.0.9-RC2':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5e8aee85ef..b3f136ff7a 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-RC2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-RC3');
 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');
 
-- 
cgit v1.2.1


From ffa6f3448fdfe6d076c894231ebbd59e3b51e2ba Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Jun 2011 21:50:02 +0200
Subject: [prep-release-3.0.9] Bump database version to RC3 too.

---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index bfbddf2dc5..92bafcb32a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9-RC2');
+define('UPDATES_TO_VERSION', '3.0.9-RC3');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
-- 
cgit v1.2.1


From cf4b639be5a178c73224246b1232e5044b9a5738 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 3 Jul 2011 02:15:40 -0400
Subject: [ticket/10247] Remove unecessary attempt_id primary key column

The database update drops any key of the same name (potential primary key) and
afterwards the column. This does not work on some of the supported DBMS and
needs further changes.

PHPBB3-10247
---
 phpBB/install/database_update.php         | 12 +++++++++++-
 phpBB/install/schemas/firebird_schema.sql | 14 --------------
 phpBB/install/schemas/mssql_schema.sql    |  8 --------
 phpBB/install/schemas/mysql_40_schema.sql |  2 --
 phpBB/install/schemas/mysql_41_schema.sql |  2 --
 phpBB/install/schemas/oracle_schema.sql   | 20 +-------------------
 phpBB/install/schemas/postgres_schema.sql |  6 +-----
 phpBB/install/schemas/sqlite_schema.sql   |  1 -
 8 files changed, 13 insertions(+), 52 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 92bafcb32a..72eb8a6480 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9-RC3');
+define('UPDATES_TO_VERSION', '3.0.9-RC4');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -974,6 +974,16 @@ function database_update_info()
 		'3.0.9-RC1'		=> array(),
 		// No changes from 3.0.9-RC2 to 3.0.9-RC3
 		'3.0.9-RC2'		=> array(),
+
+		// Changes from 3.0.9-RC-3 to 3.0.9-RC4
+		'3.0.9-RC3'     => array(
+			'drop_keys' => array(
+				LOGIN_ATTEMPT_TABLE => array('attempt_id')
+			),
+			'drop_columns' => array(
+				LOGIN_ATTEMPT_TABLE => array('attempt_id')
+			),
+		),
 	);
 }
 
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 5df7dfe9a5..40041b13cb 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -547,7 +547,6 @@ END;;
 
 # Table: 'phpbb_login_attempts'
 CREATE TABLE phpbb_login_attempts (
-	attempt_id INTEGER NOT NULL,
 	attempt_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	attempt_browser VARCHAR(150) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	attempt_forwarded_for VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
@@ -557,24 +556,11 @@ CREATE TABLE phpbb_login_attempts (
 	username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT 0 NOT NULL COLLATE UNICODE
 );;
 
-ALTER TABLE phpbb_login_attempts ADD PRIMARY KEY (attempt_id);;
-
 CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts(attempt_ip, attempt_time);;
 CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);;
 CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts(attempt_time);;
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
 
-CREATE GENERATOR phpbb_login_attempts_gen;;
-SET GENERATOR phpbb_login_attempts_gen TO 0;;
-
-CREATE TRIGGER t_phpbb_login_attempts FOR phpbb_login_attempts
-BEFORE INSERT
-AS
-BEGIN
-	NEW.attempt_id = GEN_ID(phpbb_login_attempts_gen, 1);
-END;;
-
-
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 0bc76c05e6..c4fc2d4eec 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -653,7 +653,6 @@ GO
 	Table: 'phpbb_login_attempts'
 */
 CREATE TABLE [phpbb_login_attempts] (
-	[attempt_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[attempt_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
 	[attempt_browser] [varchar] (150) DEFAULT ('') NOT NULL ,
 	[attempt_forwarded_for] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -664,13 +663,6 @@ CREATE TABLE [phpbb_login_attempts] (
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_login_attempts] PRIMARY KEY  CLUSTERED 
-	(
-		[attempt_id]
-	)  ON [PRIMARY] 
-GO
-
 CREATE  INDEX [att_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 6b13485a3d..06d32166f3 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -371,7 +371,6 @@ CREATE TABLE phpbb_log (
 
 # Table: 'phpbb_login_attempts'
 CREATE TABLE phpbb_login_attempts (
-	attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	attempt_ip varbinary(40) DEFAULT '' NOT NULL,
 	attempt_browser varbinary(150) DEFAULT '' NOT NULL,
 	attempt_forwarded_for varbinary(255) DEFAULT '' NOT NULL,
@@ -379,7 +378,6 @@ CREATE TABLE phpbb_login_attempts (
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	username blob NOT NULL,
 	username_clean blob NOT NULL,
-	PRIMARY KEY (attempt_id),
 	KEY att_ip (attempt_ip, attempt_time),
 	KEY att_for (attempt_forwarded_for, attempt_time),
 	KEY att_time (attempt_time),
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index b400e8fcff..1db2790ec7 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -371,7 +371,6 @@ CREATE TABLE phpbb_log (
 
 # Table: 'phpbb_login_attempts'
 CREATE TABLE phpbb_login_attempts (
-	attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	attempt_ip varchar(40) DEFAULT '' NOT NULL,
 	attempt_browser varchar(150) DEFAULT '' NOT NULL,
 	attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
@@ -379,7 +378,6 @@ CREATE TABLE phpbb_login_attempts (
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	username varchar(255) DEFAULT '0' NOT NULL,
 	username_clean varchar(255) DEFAULT '0' NOT NULL,
-	PRIMARY KEY (attempt_id),
 	KEY att_ip (attempt_ip, attempt_time),
 	KEY att_for (attempt_forwarded_for, attempt_time),
 	KEY att_time (attempt_time),
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8c79e870cb..783261e365 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -744,15 +744,13 @@ END;
 	Table: 'phpbb_login_attempts'
 */
 CREATE TABLE phpbb_login_attempts (
-	attempt_id number(8) NOT NULL,
 	attempt_ip varchar2(40) DEFAULT '' ,
 	attempt_browser varchar2(150) DEFAULT '' ,
 	attempt_forwarded_for varchar2(255) DEFAULT '' ,
 	attempt_time number(11) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	username varchar2(765) DEFAULT '0' NOT NULL,
-	username_clean varchar2(255) DEFAULT '0' NOT NULL,
-	CONSTRAINT pk_phpbb_login_attempts PRIMARY KEY (attempt_id)
+	username_clean varchar2(255) DEFAULT '0' NOT NULL
 )
 /
 
@@ -765,22 +763,6 @@ CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
 /
 
-CREATE SEQUENCE phpbb_login_attempts_seq
-/
-
-CREATE OR REPLACE TRIGGER t_phpbb_login_attempts
-BEFORE INSERT ON phpbb_login_attempts
-FOR EACH ROW WHEN (
-	new.attempt_id IS NULL OR new.attempt_id = 0
-)
-BEGIN
-	SELECT phpbb_login_attempts_seq.nextval
-	INTO :new.attempt_id
-	FROM dual;
-END;
-/
-
-
 /*
 	Table: 'phpbb_moderator_cache'
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 359ec325d7..cf655cb1c7 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -527,18 +527,14 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
 /*
 	Table: 'phpbb_login_attempts'
 */
-CREATE SEQUENCE phpbb_login_attempts_seq;
-
 CREATE TABLE phpbb_login_attempts (
-	attempt_id INT4 DEFAULT nextval('phpbb_login_attempts_seq'),
 	attempt_ip varchar(40) DEFAULT '' NOT NULL,
 	attempt_browser varchar(150) DEFAULT '' NOT NULL,
 	attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
 	attempt_time INT4 DEFAULT '0' NOT NULL CHECK (attempt_time >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	username varchar(255) DEFAULT '0' NOT NULL,
-	username_clean varchar_ci DEFAULT '0' NOT NULL,
-	PRIMARY KEY (attempt_id)
+	username_clean varchar_ci DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 3158c1a177..dae1eb839c 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -359,7 +359,6 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
 
 # Table: 'phpbb_login_attempts'
 CREATE TABLE phpbb_login_attempts (
-	attempt_id INTEGER PRIMARY KEY NOT NULL ,
 	attempt_ip varchar(40) NOT NULL DEFAULT '',
 	attempt_browser varchar(150) NOT NULL DEFAULT '',
 	attempt_forwarded_for varchar(255) NOT NULL DEFAULT '',
-- 
cgit v1.2.1


From 984fd07319d9c9dbd8af7298a94e08132e790f98 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 3 Jul 2011 02:29:51 -0400
Subject: [ticket/10247] Add empty data section to database update for RC4

PHPBB3-10247
---
 phpBB/install/database_update.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 72eb8a6480..e1223335f0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1983,6 +1983,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.9-RC2 to 3.0.9-RC3
 		case '3.0.9-RC2':
 		break;
+
+		// No changes from 3.0.9-RC3 to 3.0.9-RC4
+		case '3.0.9-RC3':
+		break;
 	}
 }
 
-- 
cgit v1.2.1


From cb7604dcd83bf3a4ddf6ace1282974eaf475c8d8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 4 Jul 2011 02:31:00 -0400
Subject: [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1
 updater.

To make sure that this column (which was too small and unecessary) does not
remain on 3.0.9-RCX installations and boards that were updated to a 3.0.9 RC,
the 3.0.10-RC1 release must correctly drop the column after db_tools has been
corrected and fully reviewed. The current version is not capable of dropping
primary keys correctly on all supported DBMSs.

PHPBB3-10247
---
 phpBB/install/database_update.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e1223335f0..a45424afea 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -946,7 +946,12 @@ function database_update_info()
 			'add_tables'		=> array(
 				LOGIN_ATTEMPT_TABLE	=> array(
 					'COLUMNS'			=> array(
-						'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+						// this column was removed from the database updater
+						// after 3.0.9-RC3 was released. It might still exist
+						// in 3.0.9-RCX installations and has to be dropped in
+						// 3.0.10 after the db_tools class is capable of properly
+						// removing a primary key.
+						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
 						'attempt_ip'			=> array('VCHAR:40', ''),
 						'attempt_browser'		=> array('VCHAR:150', ''),
 						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
@@ -974,16 +979,10 @@ function database_update_info()
 		'3.0.9-RC1'		=> array(),
 		// No changes from 3.0.9-RC2 to 3.0.9-RC3
 		'3.0.9-RC2'		=> array(),
+		// No changes from 3.0.9-RC3 to 3.0.9-RC4
+		'3.0.9-RC3'     => array(),
 
-		// Changes from 3.0.9-RC-3 to 3.0.9-RC4
-		'3.0.9-RC3'     => array(
-			'drop_keys' => array(
-				LOGIN_ATTEMPT_TABLE => array('attempt_id')
-			),
-			'drop_columns' => array(
-				LOGIN_ATTEMPT_TABLE => array('attempt_id')
-			),
-		),
+		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
 	);
 }
 
-- 
cgit v1.2.1


From d8ac2cc5f0c253842185506b174a8355dfd5f3fb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 5 Jul 2011 00:40:45 +0200
Subject: [prep-release-3.0.9] Bumping version number for the final 3.0.9
 release.

---
 phpBB/install/database_update.php     | 6 +++---
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a45424afea..a2cb4515da 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9-RC4');
+define('UPDATES_TO_VERSION', '3.0.9');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -979,7 +979,7 @@ function database_update_info()
 		'3.0.9-RC1'		=> array(),
 		// No changes from 3.0.9-RC2 to 3.0.9-RC3
 		'3.0.9-RC2'		=> array(),
-		// No changes from 3.0.9-RC3 to 3.0.9-RC4
+		// No changes from 3.0.9-RC3 to 3.0.9
 		'3.0.9-RC3'     => array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
@@ -1983,7 +1983,7 @@ function change_database_data(&$no_updates, $version)
 		case '3.0.9-RC2':
 		break;
 
-		// No changes from 3.0.9-RC3 to 3.0.9-RC4
+		// No changes from 3.0.9-RC3 to 3.0.9
 		case '3.0.9-RC3':
 		break;
 	}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index b3f136ff7a..0153bd8ec2 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-RC3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9');
 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');
 
-- 
cgit v1.2.1


From 0c93e92eef248c306c743601f6fadb8dc4eb8aa3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 5 Jul 2011 23:19:39 +0200
Subject: [ticket/10247] Remove attempt_id as primary key from
 database_update.php

PHPBB3-10247
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a2cb4515da..47c278ed4e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -960,7 +960,7 @@ function database_update_info()
 						'username'				=> array('VCHAR_UNI:255', 0),
 						'username_clean'		=> array('VCHAR_CI', 0),
 					),
-					'PRIMARY_KEY'		=> 'attempt_id',
+					//'PRIMARY_KEY'		=> 'attempt_id',
 					'KEYS'				=> array(
 						'att_ip'			=> array('INDEX', array('attempt_ip', 'attempt_time')),
 						'att_for'	=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-- 
cgit v1.2.1


From a275d17625325e0353b67fabf5a9b0c4fb35877e Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Wed, 6 Jul 2011 20:38:02 -0400
Subject: [ticket/9859] Changing all phpBB footers to match the new credit line

PHPBB3-9859
---
 phpBB/install/database_update.php | 2 +-
 phpBB/install/index.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 47c278ed4e..ac08466a01 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -525,7 +525,7 @@ function _print_footer()
 	</div>
 
 	<div id="page-footer">
-		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
+		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 	</div>
 </div>
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index f534980389..5135e2dbd8 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -569,7 +569,7 @@ class module
 		echo '		</div>';
 		echo '	</div>';
 		echo '	<div id="page-footer">';
-		echo '		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group';
+		echo '		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group';
 		echo '	</div>';
 		echo '</div>';
 		echo '</body>';
-- 
cgit v1.2.1


From 787245a113bc8a4d99050414fd06662c60cc2e57 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 7 Jul 2011 20:19:11 +0200
Subject: [prep-release-3.0.9] Decreasing version for an RC4 release.

---
 phpBB/install/database_update.php     | 6 +++---
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index ac08466a01..097f6302dc 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9');
+define('UPDATES_TO_VERSION', '3.0.9-RC4');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -979,7 +979,7 @@ function database_update_info()
 		'3.0.9-RC1'		=> array(),
 		// No changes from 3.0.9-RC2 to 3.0.9-RC3
 		'3.0.9-RC2'		=> array(),
-		// No changes from 3.0.9-RC3 to 3.0.9
+		// No changes from 3.0.9-RC3 to 3.0.9-RC4
 		'3.0.9-RC3'     => array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
@@ -1983,7 +1983,7 @@ function change_database_data(&$no_updates, $version)
 		case '3.0.9-RC2':
 		break;
 
-		// No changes from 3.0.9-RC3 to 3.0.9
+		// No changes from 3.0.9-RC3 to 3.0.9-RC4
 		case '3.0.9-RC3':
 		break;
 	}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 0153bd8ec2..1eb2f51645 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-RC4');
 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');
 
-- 
cgit v1.2.1


From 919ba8eb3fd454d9a485bea7daf791a0858dec94 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 8 Jul 2011 20:32:12 -0400
Subject: [ticket/10003] Delete the copy of db_tools in database_update.php.

PHPBB3-10003
---
 phpBB/install/database_update.php | 2239 -------------------------------------
 1 file changed, 2239 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 99928e1007..d73848c871 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1989,2243 +1989,4 @@ function change_database_data(&$no_updates, $version)
 	}
 }
 
-
-/**
-* Database Tools for handling cross-db actions such as altering columns, etc.
-* Currently not supported is returning SQL for creating tables.
-*
-* @package dbal
-*/
-class updater_db_tools
-{
-	/**
-	* Current sql layer
-	*/
-	var $sql_layer = '';
-
-	/**
-	* @var object DB object
-	*/
-	var $db = NULL;
-
-	/**
-	* The Column types for every database we support
-	* @var array
-	*/
-	var $dbms_type_map = array(
-		'mysql_41'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'smallint(4) UNSIGNED',
-			'BOOL'		=> 'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'text',
-			'XSTEXT_UNI'=> 'varchar(100)',
-			'STEXT'		=> 'text',
-			'STEXT_UNI'	=> 'varchar(255)',
-			'TEXT'		=> 'text',
-			'TEXT_UNI'	=> 'text',
-			'MTEXT'		=> 'mediumtext',
-			'MTEXT_UNI'	=> 'mediumtext',
-			'TIMESTAMP'	=> 'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar(255)',
-			'VARBINARY'	=> 'varbinary(255)',
-		),
-
-		'mysql_40'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'smallint(4) UNSIGNED',
-			'BOOL'		=> 'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varbinary(255)',
-			'VCHAR:'	=> 'varbinary(%d)',
-			'CHAR:'		=> 'binary(%d)',
-			'XSTEXT'	=> 'blob',
-			'XSTEXT_UNI'=> 'blob',
-			'STEXT'		=> 'blob',
-			'STEXT_UNI'	=> 'blob',
-			'TEXT'		=> 'blob',
-			'TEXT_UNI'	=> 'blob',
-			'MTEXT'		=> 'mediumblob',
-			'MTEXT_UNI'	=> 'mediumblob',
-			'TIMESTAMP'	=> 'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'blob',
-			'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')),
-			'VCHAR_CI'	=> 'blob',
-			'VARBINARY'	=> 'varbinary(255)',
-		),
-
-		'firebird'	=> array(
-			'INT:'		=> 'INTEGER',
-			'BINT'		=> 'DOUBLE PRECISION',
-			'UINT'		=> 'INTEGER',
-			'UINT:'		=> 'INTEGER',
-			'TINT:'		=> 'INTEGER',
-			'USINT'		=> 'INTEGER',
-			'BOOL'		=> 'INTEGER',
-			'VCHAR'		=> 'VARCHAR(255) CHARACTER SET NONE',
-			'VCHAR:'	=> 'VARCHAR(%d) CHARACTER SET NONE',
-			'CHAR:'		=> 'CHAR(%d) CHARACTER SET NONE',
-			'XSTEXT'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'STEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'TEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'MTEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8',
-			'STEXT_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'TEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-			'MTEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-			'TIMESTAMP'	=> 'INTEGER',
-			'DECIMAL'	=> 'DOUBLE PRECISION',
-			'DECIMAL:'	=> 'DOUBLE PRECISION',
-			'PDECIMAL'	=> 'DOUBLE PRECISION',
-			'PDECIMAL:'	=> 'DOUBLE PRECISION',
-			'VCHAR_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8',
-			'VCHAR_CI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'VARBINARY'	=> 'CHAR(255) CHARACTER SET NONE',
-		),
-
-		'mssql'		=> array(
-			'INT:'		=> '[int]',
-			'BINT'		=> '[float]',
-			'UINT'		=> '[int]',
-			'UINT:'		=> '[int]',
-			'TINT:'		=> '[int]',
-			'USINT'		=> '[int]',
-			'BOOL'		=> '[int]',
-			'VCHAR'		=> '[varchar] (255)',
-			'VCHAR:'	=> '[varchar] (%d)',
-			'CHAR:'		=> '[char] (%d)',
-			'XSTEXT'	=> '[varchar] (1000)',
-			'STEXT'		=> '[varchar] (3000)',
-			'TEXT'		=> '[varchar] (8000)',
-			'MTEXT'		=> '[text]',
-			'XSTEXT_UNI'=> '[varchar] (100)',
-			'STEXT_UNI'	=> '[varchar] (255)',
-			'TEXT_UNI'	=> '[varchar] (4000)',
-			'MTEXT_UNI'	=> '[text]',
-			'TIMESTAMP'	=> '[int]',
-			'DECIMAL'	=> '[float]',
-			'DECIMAL:'	=> '[float]',
-			'PDECIMAL'	=> '[float]',
-			'PDECIMAL:'	=> '[float]',
-			'VCHAR_UNI'	=> '[varchar] (255)',
-			'VCHAR_UNI:'=> '[varchar] (%d)',
-			'VCHAR_CI'	=> '[varchar] (255)',
-			'VARBINARY'	=> '[varchar] (255)',
-		),
-
-		'mssqlnative'	=> array(
-			'INT:'		=> '[int]',
-			'BINT'		=> '[float]',
-			'UINT'		=> '[int]',
-			'UINT:'		=> '[int]',
-			'TINT:'		=> '[int]',
-			'USINT'		=> '[int]',
-			'BOOL'		=> '[int]',
-			'VCHAR'		=> '[varchar] (255)',
-			'VCHAR:'	=> '[varchar] (%d)',
-			'CHAR:'		=> '[char] (%d)',
-			'XSTEXT'	=> '[varchar] (1000)',
-			'STEXT'		=> '[varchar] (3000)',
-			'TEXT'		=> '[varchar] (8000)',
-			'MTEXT'		=> '[text]',
-			'XSTEXT_UNI'=> '[varchar] (100)',
-			'STEXT_UNI'	=> '[varchar] (255)',
-			'TEXT_UNI'	=> '[varchar] (4000)',
-			'MTEXT_UNI'	=> '[text]',
-			'TIMESTAMP'	=> '[int]',
-			'DECIMAL'	=> '[float]',
-			'DECIMAL:'	=> '[float]',
-			'PDECIMAL'	=> '[float]',
-			'PDECIMAL:'	=> '[float]',
-			'VCHAR_UNI'	=> '[varchar] (255)',
-			'VCHAR_UNI:'=> '[varchar] (%d)',
-			'VCHAR_CI'	=> '[varchar] (255)',
-			'VARBINARY'	=> '[varchar] (255)',
-		),
-
-		'oracle'	=> array(
-			'INT:'		=> 'number(%d)',
-			'BINT'		=> 'number(20)',
-			'UINT'		=> 'number(8)',
-			'UINT:'		=> 'number(%d)',
-			'TINT:'		=> 'number(%d)',
-			'USINT'		=> 'number(4)',
-			'BOOL'		=> 'number(1)',
-			'VCHAR'		=> 'varchar2(255)',
-			'VCHAR:'	=> 'varchar2(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar2(1000)',
-			'STEXT'		=> 'varchar2(3000)',
-			'TEXT'		=> 'clob',
-			'MTEXT'		=> 'clob',
-			'XSTEXT_UNI'=> 'varchar2(300)',
-			'STEXT_UNI'	=> 'varchar2(765)',
-			'TEXT_UNI'	=> 'clob',
-			'MTEXT_UNI'	=> 'clob',
-			'TIMESTAMP'	=> 'number(11)',
-			'DECIMAL'	=> 'number(5, 2)',
-			'DECIMAL:'	=> 'number(%d, 2)',
-			'PDECIMAL'	=> 'number(6, 3)',
-			'PDECIMAL:'	=> 'number(%d, 3)',
-			'VCHAR_UNI'	=> 'varchar2(765)',
-			'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
-			'VCHAR_CI'	=> 'varchar2(255)',
-			'VARBINARY'	=> 'raw(255)',
-		),
-
-		'sqlite'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED',
-			'BOOL'		=> 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'text(65535)',
-			'STEXT'		=> 'text(65535)',
-			'TEXT'		=> 'text(65535)',
-			'MTEXT'		=> 'mediumtext(16777215)',
-			'XSTEXT_UNI'=> 'text(65535)',
-			'STEXT_UNI'	=> 'text(65535)',
-			'TEXT_UNI'	=> 'text(65535)',
-			'MTEXT_UNI'	=> 'mediumtext(16777215)',
-			'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar(255)',
-			'VARBINARY'	=> 'blob',
-		),
-
-		'postgres'	=> array(
-			'INT:'		=> 'INT4',
-			'BINT'		=> 'INT8',
-			'UINT'		=> 'INT4', // unsigned
-			'UINT:'		=> 'INT4', // unsigned
-			'USINT'		=> 'INT2', // unsigned
-			'BOOL'		=> 'INT2', // unsigned
-			'TINT:'		=> 'INT2',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar(1000)',
-			'STEXT'		=> 'varchar(3000)',
-			'TEXT'		=> 'varchar(8000)',
-			'MTEXT'		=> 'TEXT',
-			'XSTEXT_UNI'=> 'varchar(100)',
-			'STEXT_UNI'	=> 'varchar(255)',
-			'TEXT_UNI'	=> 'varchar(4000)',
-			'MTEXT_UNI'	=> 'TEXT',
-			'TIMESTAMP'	=> 'INT4', // unsigned
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar_ci',
-			'VARBINARY'	=> 'bytea',
-		),
-	);
-
-	/**
-	* A list of types being unsigned for better reference in some db's
-	* @var array
-	*/
-	var $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
-
-	/**
-	* A list of supported DBMS. We change this class to support more DBMS, the DBMS itself only need to follow some rules.
-	* @var array
-	*/
-	var $supported_dbms = array('firebird', 'mssql', 'mssqlnative', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
-
-	/**
-	* This is set to true if user only wants to return the 'to-be-executed' SQL statement(s) (as an array).
-	* This mode has no effect on some methods (inserting of data for example). This is expressed within the methods command.
-	*/
-	var $return_statements = false;
-
-	/**
-	* Constructor. Set DB Object and set {@link $return_statements return_statements}.
-	*
-	* @param phpbb_dbal	$db					DBAL object
-	* @param bool		$return_statements	True if only statements should be returned and no SQL being executed
-	*/
-	function updater_db_tools(&$db, $return_statements = false)
-	{
-		$this->db = $db;
-		$this->return_statements = $return_statements;
-
-		// Determine mapping database type
-		switch ($this->db->sql_layer)
-		{
-			case 'mysql':
-				$this->sql_layer = 'mysql_40';
-			break;
-
-			case 'mysql4':
-				if (version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-				{
-					$this->sql_layer = 'mysql_41';
-				}
-				else
-				{
-					$this->sql_layer = 'mysql_40';
-				}
-			break;
-
-			case 'mysqli':
-				$this->sql_layer = 'mysql_41';
-			break;
-
-			case 'mssql':
-			case 'mssql_odbc':
-				$this->sql_layer = 'mssql';
-			break;
-
-			case 'mssqlnative':
-				$this->sql_layer = 'mssqlnative';
-			break;
-
-			default:
-				$this->sql_layer = $this->db->sql_layer;
-			break;
-		}
-	}
-
-	/**
-	* Check if table exists
-	*
-	*
-	* @param string	$table_name	The table name to check for
-	* @return bool true if table exists, else false
-	*/
-	function sql_table_exists($table_name)
-	{
-		$this->db->sql_return_on_error(true);
-		$result = $this->db->sql_query_limit('SELECT * FROM ' . $table_name, 1);
-		$this->db->sql_return_on_error(false);
-
-		if ($result)
-		{
-			$this->db->sql_freeresult($result);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Create SQL Table
-	*
-	* @param string	$table_name	The table name to create
-	* @param array	$table_data	Array containing table data.
-	* @return array	Statements if $return_statements is true.
-	*/
-	function sql_create_table($table_name, $table_data)
-	{
-		// holds the DDL for a column
-		$columns = $statements = array();
-
-		if ($this->sql_table_exists($table_name))
-		{
-			return $this->_sql_run_sql($statements);
-		}
-
-		// Begin transaction
-		$statements[] = 'begin';
-
-		// Determine if we have created a PRIMARY KEY in the earliest
-		$primary_key_gen = false;
-
-		// Determine if the table must be created with TEXTIMAGE
-		$create_textimage = false;
-
-		// Determine if the table requires a sequence
-		$create_sequence = false;
-
-		// Begin table sql statement
-		switch ($this->sql_layer)
-		{
-			case 'mssql':
-			case 'mssqlnative':
-				$table_sql = 'CREATE TABLE [' . $table_name . '] (' . "\n";
-			break;
-
-			default:
-				$table_sql = 'CREATE TABLE ' . $table_name . ' (' . "\n";
-			break;
-		}
-
-		// Iterate through the columns to create a table
-		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
-		{
-			// here lies an array, filled with information compiled on the column's data
-			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-
-			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
-			{
-				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR);
-			}
-
-			// here we add the definition of the new column to the list of columns
-			switch ($this->sql_layer)
-			{
-				case 'mssql':
-				case 'mssqlnative':
-					$columns[] = "\t [{$column_name}] " . $prepared_column['column_type_sql_default'];
-				break;
-
-				default:
-					$columns[] = "\t {$column_name} " . $prepared_column['column_type_sql'];
-				break;
-			}
-
-			// see if we have found a primary key set due to a column definition if we have found it, we can stop looking
-			if (!$primary_key_gen)
-			{
-				$primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set'];
-			}
-
-			// create textimage DDL based off of the existance of certain column types
-			if (!$create_textimage)
-			{
-				$create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage'];
-			}
-
-			// create sequence DDL based off of the existance of auto incrementing columns
-			if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'])
-			{
-				$create_sequence = $column_name;
-			}
-		}
-
-		// this makes up all the columns in the create table statement
-		$table_sql .= implode(",\n", $columns);
-
-		// Close the table for two DBMS and add to the statements
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '');
-				$statements[] = $table_sql;
-			break;
-		}
-
-		// we have yet to create a primary key for this table,
-		// this means that we can add the one we really wanted instead
-		if (!$primary_key_gen)
-		{
-			// Write primary key
-			if (isset($table_data['PRIMARY_KEY']))
-			{
-				if (!is_array($table_data['PRIMARY_KEY']))
-				{
-					$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
-				}
-
-				switch ($this->sql_layer)
-				{
-					case 'mysql_40':
-					case 'mysql_41':
-					case 'postgres':
-					case 'sqlite':
-						$table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
-					break;
-
-					case 'firebird':
-					case 'mssql':
-					case 'mssqlnative':
-						// We need the data here
-						$old_return_statements = $this->return_statements;
-						$this->return_statements = true;
-
-						$primary_key_stmts = $this->sql_create_primary_key($table_name, $table_data['PRIMARY_KEY']);
-						foreach ($primary_key_stmts as $pk_stmt)
-						{
-							$statements[] = $pk_stmt;
-						}
-
-						$this->return_statements = $old_return_statements;
-					break;
-
-					case 'oracle':
-						$table_sql .= ",\n\t CONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
-					break;
-				}
-			}
-		}
-
-		// close the table
-		switch ($this->sql_layer)
-		{
-			case 'mysql_41':
-				// make sure the table is in UTF-8 mode
-				$table_sql .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;";
-				$statements[] = $table_sql;
-			break;
-
-			case 'mysql_40':
-			case 'sqlite':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'postgres':
-				// do we need to add a sequence for auto incrementing columns?
-				if ($create_sequence)
-				{
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
-				}
-
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'oracle':
-				$table_sql .= "\n)";
-				$statements[] = $table_sql;
-
-				// do we need to add a sequence and a tigger for auto incrementing columns?
-				if ($create_sequence)
-				{
-					// create the actual sequence
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq";
-
-					// the trigger is the mechanism by which we increment the counter
-					$trigger = "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
-					$trigger .= "BEFORE INSERT ON {$table_name}\n";
-					$trigger .= "FOR EACH ROW WHEN (\n";
-					$trigger .= "\tnew.{$create_sequence} IS NULL OR new.{$create_sequence} = 0\n";
-					$trigger .= ")\n";
-					$trigger .= "BEGIN\n";
-					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
-					$trigger .= "\tINTO :new.{$create_sequence}\n";
-					$trigger .= "\tFROM dual;\n";
-					$trigger .= "END;";
-
-					$statements[] = $trigger;
-				}
-			break;
-
-			case 'firebird':
-				if ($create_sequence)
-				{
-					$statements[] = "CREATE GENERATOR {$table_name}_gen;";
-					$statements[] = "SET GENERATOR {$table_name}_gen TO 0;";
-
-					$trigger = "CREATE TRIGGER t_$table_name FOR $table_name\n";
-					$trigger .= "BEFORE INSERT\nAS\nBEGIN\n";
-					$trigger .= "\tNEW.{$create_sequence} = GEN_ID({$table_name}_gen, 1);\nEND;";
-					$statements[] = $trigger;
-				}
-			break;
-		}
-
-		// Write Keys
-		if (isset($table_data['KEYS']))
-		{
-			foreach ($table_data['KEYS'] as $key_name => $key_data)
-			{
-				if (!is_array($key_data[1]))
-				{
-					$key_data[1] = array($key_data[1]);
-				}
-
-				$old_return_statements = $this->return_statements;
-				$this->return_statements = true;
-
-				$key_stmts = ($key_data[0] == 'UNIQUE') ? $this->sql_create_unique_index($table_name, $key_name, $key_data[1]) : $this->sql_create_index($table_name, $key_name, $key_data[1]);
-
-				foreach ($key_stmts as $key_stmt)
-				{
-					$statements[] = $key_stmt;
-				}
-
-				$this->return_statements = $old_return_statements;
-			}
-		}
-
-		// Commit Transaction
-		$statements[] = 'commit';
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Handle passed database update array.
-	* Expected structure...
-	* Key being one of the following
-	*	change_columns: Column changes (only type, not name)
-	*	add_columns: Add columns to a table
-	*	drop_keys: Dropping keys
-	*	drop_columns: Removing/Dropping columns
-	*	add_primary_keys: adding primary keys
-	*	add_unique_index: adding an unique index
-	*	add_index: adding an index (can be column:index_size if you need to provide size)
-	*
-	* The values are in this format:
-	*		{TABLE NAME}		=> array(
-	*			{COLUMN NAME}		=> array({COLUMN TYPE}, {DEFAULT VALUE}, {OPTIONAL VARIABLES}),
-	*			{KEY/INDEX NAME}	=> array({COLUMN NAMES}),
-	*		)
-	*
-	* For more information have a look at /develop/create_schema_files.php (only available through SVN)
-	*/
-	function perform_schema_changes($schema_changes)
-	{
-		if (empty($schema_changes))
-		{
-			return;
-		}
-
-		$statements = array();
-		$sqlite = false;
-
-		// For SQLite we need to perform the schema changes in a much more different way
-		if ($this->db->sql_layer == 'sqlite' && $this->return_statements)
-		{
-			$sqlite_data = array();
-			$sqlite = true;
-		}
-
-		// Add tables?
-		if (!empty($schema_changes['add_tables']))
-		{
-			foreach ($schema_changes['add_tables'] as $table => $table_data)
-			{
-				$result = $this->sql_create_table($table, $table_data);
-				if ($this->return_statements)
-				{
-					$statements = array_merge($statements, $result);
-				}
-			}
-		}
-
-		// Change columns?
-		if (!empty($schema_changes['change_columns']))
-		{
-			foreach ($schema_changes['change_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column_name => $column_data)
-				{
-					// If the column exists we change it, else we add it ;)
-					if ($column_exists = $this->sql_column_exists($table, $column_name))
-					{
-						$result = $this->sql_column_change($table, $column_name, $column_data, true);
-					}
-					else
-					{
-						$result = $this->sql_column_add($table, $column_name, $column_data, true);
-					}
-
-					if ($sqlite)
-					{
-						if ($column_exists)
-						{
-							$sqlite_data[$table]['change_columns'][] = $result;
-						}
-						else
-						{
-							$sqlite_data[$table]['add_columns'][] = $result;
-						}
-					}
-					else if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add columns?
-		if (!empty($schema_changes['add_columns']))
-		{
-			foreach ($schema_changes['add_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column_name => $column_data)
-				{
-					// Only add the column if it does not exist yet
-					if ($column_exists = $this->sql_column_exists($table, $column_name))
-					{
-						continue;
-						// This is commented out here because it can take tremendous time on updates
-//						$result = $this->sql_column_change($table, $column_name, $column_data, true);
-					}
-					else
-					{
-						$result = $this->sql_column_add($table, $column_name, $column_data, true);
-					}
-
-					if ($sqlite)
-					{
-						if ($column_exists)
-						{
-							continue;
-//							$sqlite_data[$table]['change_columns'][] = $result;
-						}
-						else
-						{
-							$sqlite_data[$table]['add_columns'][] = $result;
-						}
-					}
-					else if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Remove keys?
-		if (!empty($schema_changes['drop_keys']))
-		{
-			foreach ($schema_changes['drop_keys'] as $table => $indexes)
-			{
-				foreach ($indexes as $index_name)
-				{
-					if (!$this->sql_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_index_drop($table, $index_name);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Drop columns?
-		if (!empty($schema_changes['drop_columns']))
-		{
-			foreach ($schema_changes['drop_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column)
-				{
-					// Only remove the column if it exists...
-					if ($this->sql_column_exists($table, $column))
-					{
-						$result = $this->sql_column_remove($table, $column, true);
-
-						if ($sqlite)
-						{
-							$sqlite_data[$table]['drop_columns'][] = $result;
-						}
-						else if ($this->return_statements)
-						{
-							$statements = array_merge($statements, $result);
-						}
-					}
-				}
-			}
-		}
-
-		// Add primary keys?
-		if (!empty($schema_changes['add_primary_keys']))
-		{
-			foreach ($schema_changes['add_primary_keys'] as $table => $columns)
-			{
-				$result = $this->sql_create_primary_key($table, $columns, true);
-
-				if ($sqlite)
-				{
-					$sqlite_data[$table]['primary_key'] = $result;
-				}
-				else if ($this->return_statements)
-				{
-					$statements = array_merge($statements, $result);
-				}
-			}
-		}
-
-		// Add unqiue indexes?
-		if (!empty($schema_changes['add_unique_index']))
-		{
-			foreach ($schema_changes['add_unique_index'] as $table => $index_array)
-			{
-				foreach ($index_array as $index_name => $column)
-				{
-					if ($this->sql_unique_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_create_unique_index($table, $index_name, $column);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add indexes?
-		if (!empty($schema_changes['add_index']))
-		{
-			foreach ($schema_changes['add_index'] as $table => $index_array)
-			{
-				foreach ($index_array as $index_name => $column)
-				{
-					if ($this->sql_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_create_index($table, $index_name, $column);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		if ($sqlite)
-		{
-			foreach ($sqlite_data as $table_name => $sql_schema_changes)
-			{
-				// Create temporary table with original data
-				$statements[] = 'begin';
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					continue;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				// Create a backup table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				// Get the columns...
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$plain_table_cols = trim($matches[1]);
-				$new_table_cols = preg_split('/,(?![\s\w]+\))/m', $plain_table_cols);
-				$column_list = array();
-
-				foreach ($new_table_cols as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-					$column_list[] = $entities[0];
-				}
-
-				// note down the primary key notation because sqlite only supports adding it to the end for the new table
-				$primary_key = false;
-				$_new_cols = array();
-
-				foreach ($new_table_cols as $key => $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						$primary_key = $declaration;
-						continue;
-					}
-					$_new_cols[] = $declaration;
-				}
-
-				$new_table_cols = $_new_cols;
-
-				// First of all... change columns
-				if (!empty($sql_schema_changes['change_columns']))
-				{
-					foreach ($sql_schema_changes['change_columns'] as $column_sql)
-					{
-						foreach ($new_table_cols as $key => $declaration)
-						{
-							$entities = preg_split('#\s+#', trim($declaration));
-							if (strpos($column_sql, $entities[0] . ' ') === 0)
-							{
-								$new_table_cols[$key] = $column_sql;
-							}
-						}
-					}
-				}
-
-				if (!empty($sql_schema_changes['add_columns']))
-				{
-					foreach ($sql_schema_changes['add_columns'] as $column_sql)
-					{
-						$new_table_cols[] = $column_sql;
-					}
-				}
-
-				// Now drop them...
-				if (!empty($sql_schema_changes['drop_columns']))
-				{
-					foreach ($sql_schema_changes['drop_columns'] as $column_name)
-					{
-						// Remove from column list...
-						$new_column_list = array();
-						foreach ($column_list as $key => $value)
-						{
-							if ($value === $column_name)
-							{
-								continue;
-							}
-
-							$new_column_list[] = $value;
-						}
-
-						$column_list = $new_column_list;
-
-						// Remove from table...
-						$_new_cols = array();
-						foreach ($new_table_cols as $key => $declaration)
-						{
-							$entities = preg_split('#\s+#', trim($declaration));
-							if (strpos($column_name . ' ', $entities[0] . ' ') === 0)
-							{
-								continue;
-							}
-							$_new_cols[] = $declaration;
-						}
-						$new_table_cols = $_new_cols;
-					}
-				}
-
-				// Primary key...
-				if (!empty($sql_schema_changes['primary_key']))
-				{
-					$new_table_cols[] = 'PRIMARY KEY (' . implode(', ', $sql_schema_changes['primary_key']) . ')';
-				}
-				// Add a new one or the old primary key
-				else if ($primary_key !== false)
-				{
-					$new_table_cols[] = $primary_key;
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $new_table_cols) . ');';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-			}
-		}
-
-		if ($this->return_statements)
-		{
-			return $statements;
-		}
-	}
-
-	/**
-	* Check if a specified column exist
-	*
-	* @param string	$table			Table to check the column at
-	* @param string	$column_name	The column to check
-	*
-	* @return bool True if column exists, else false
-	*/
-	function sql_column_exists($table, $column_name)
-	{
-		switch ($this->sql_layer)
-		{
-			case 'mysql_40':
-			case 'mysql_41':
-
-				$sql = "SHOW COLUMNS FROM $table";
-				$result = $this->db->sql_query($sql);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['Field']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			// PostgreSQL has a way of doing this in a much simpler way but would
-			// not allow us to support all versions of PostgreSQL
-			case 'postgres':
-				$sql = "SELECT a.attname
-					FROM pg_class c, pg_attribute a
-					WHERE c.relname = '{$table}'
-						AND a.attnum > 0
-						AND a.attrelid = c.oid";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['attname']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-
-				return false;
-			break;
-
-			// same deal with PostgreSQL, we must perform more complex operations than
-			// we technically could
-			case 'mssql':
-			case 'mssqlnative':
-				$sql = "SELECT c.name
-					FROM syscolumns c
-					LEFT JOIN sysobjects o ON c.id = o.id
-					WHERE o.name = '{$table}'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['name']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			case 'oracle':
-				$sql = "SELECT column_name
-					FROM user_tab_columns
-					WHERE LOWER(table_name) = '" . strtolower($table) . "'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['column_name']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			case 'firebird':
-				$sql = "SELECT RDB\$FIELD_NAME as FNAME
-					FROM RDB\$RELATION_FIELDS
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table) . "'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['fname']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			// ugh, SQLite
-			case 'sqlite':
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table}'";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					return false;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$cols = trim($matches[1]);
-				$col_array = preg_split('/,(?![\s\w]+\))/m', $cols);
-
-				foreach ($col_array as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-
-					if (strtolower($entities[0]) == $column_name)
-					{
-						return true;
-					}
-				}
-				return false;
-			break;
-		}
-	}
-
-	/**
-	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
-	*
-	* @param string	$table_name		Table to check the index at
-	* @param string	$index_name		The index name to check
-	*
-	* @return bool True if index exists, else false
-	*/
-	function sql_index_exists($table_name, $index_name)
-	{
-		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($row['TYPE'] == 3)
-				{
-					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-			}
-			$this->db->sql_freeresult($result);
-
-			return false;
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-					FROM RDB\$INDICES
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
-						AND RDB\$UNIQUE_FLAG IS NULL
-						AND RDB\$FOREIGN_KEY IS NULL";
-				$col = 'index_name';
-			break;
-
-			case 'postgres':
-				$sql = "SELECT ic.relname as index_name
-					FROM pg_class bc, pg_class ic, pg_index i
-					WHERE (bc.oid = i.indrelid)
-						AND (ic.oid = i.indexrelid)
-						AND (bc.relname = '" . $table_name . "')
-						AND (i.indisunique != 't')
-						AND (i.indisprimary != 't')";
-				$col = 'index_name';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql = 'SHOW KEYS
-					FROM ' . $table_name;
-				$col = 'Key_name';
-			break;
-
-			case 'oracle':
-				$sql = "SELECT index_name
-					FROM user_indexes
-					WHERE table_name = '" . strtoupper($table_name) . "'
-						AND generated = 'N'
-						AND uniqueness = 'NONUNIQUE'";
-				$col = 'index_name';
-			break;
-
-			case 'sqlite':
-				$sql = "PRAGMA index_list('" . $table_name . "');";
-				$col = 'name';
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
-			{
-				continue;
-			}
-
-			// These DBMS prefix index name with the table name
-			switch ($this->sql_layer)
-			{
-				case 'firebird':
-				case 'oracle':
-				case 'postgres':
-				case 'sqlite':
-					$row[$col] = substr($row[$col], strlen($table_name) + 1);
-				break;
-			}
-
-			if (strtolower($row[$col]) == strtolower($index_name))
-			{
-				$this->db->sql_freeresult($result);
-				return true;
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		return false;
-	}
-
-	/**
-	* Check if a specified UNIQUE index exists in table.
-	*
-	* @param string	$table_name		Table to check the index at
-	* @param string	$index_name		The index name to check
-	*
-	* @return bool True if index exists, else false
-	*/
-	function sql_unique_index_exists($table_name, $index_name)
-	{
-		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				// Usually NON_UNIQUE is the column we want to check, but we allow for both
-				if ($row['TYPE'] == 3)
-				{
-					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-			}
-			$this->db->sql_freeresult($result);
-			return false;
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-					FROM RDB\$INDICES
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
-						AND RDB\$UNIQUE_FLAG IS NOT NULL
-						AND RDB\$FOREIGN_KEY IS NULL";
-				$col = 'index_name';
-			break;
-
-			case 'postgres':
-				$sql = "SELECT ic.relname as index_name, i.indisunique
-					FROM pg_class bc, pg_class ic, pg_index i
-					WHERE (bc.oid = i.indrelid)
-						AND (ic.oid = i.indexrelid)
-						AND (bc.relname = '" . $table_name . "')
-						AND (i.indisprimary != 't')";
-				$col = 'index_name';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql = 'SHOW KEYS
-					FROM ' . $table_name;
-				$col = 'Key_name';
-			break;
-
-			case 'oracle':
-				$sql = "SELECT index_name, table_owner
-					FROM user_indexes
-					WHERE table_name = '" . strtoupper($table_name) . "'
-						AND generated = 'N'
-						AND uniqueness = 'UNIQUE'";
-				$col = 'index_name';
-			break;
-
-			case 'sqlite':
-				$sql = "PRAGMA index_list('" . $table_name . "');";
-				$col = 'name';
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && ($row['Non_unique'] || $row[$col] == 'PRIMARY'))
-			{
-				continue;
-			}
-
-			if ($this->sql_layer == 'sqlite' && !$row['unique'])
-			{
-				continue;
-			}
-
-			if ($this->sql_layer == 'postgres' && $row['indisunique'] != 't')
-			{
-				continue;
-			}
-
-			// These DBMS prefix index name with the table name
-			switch ($this->sql_layer)
-			{
-				case 'oracle':
-					// Two cases here... prefixed with U_[table_owner] and not prefixed with table_name
-					if (strpos($row[$col], 'U_') === 0)
-					{
-						$row[$col] = substr($row[$col], strlen('U_' . $row['table_owner']) + 1);
-					}
-					else if (strpos($row[$col], strtoupper($table_name)) === 0)
-					{
-						$row[$col] = substr($row[$col], strlen($table_name) + 1);
-					}
-				break;
-
-				case 'firebird':
-				case 'postgres':
-				case 'sqlite':
-					$row[$col] = substr($row[$col], strlen($table_name) + 1);
-				break;
-			}
-
-			if (strtolower($row[$col]) == strtolower($index_name))
-			{
-				$this->db->sql_freeresult($result);
-				return true;
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		return false;
-	}
-
-	/**
-	* Private method for performing sql statements (either execute them or return them)
-	* @access private
-	*/
-	function _sql_run_sql($statements)
-	{
-		if ($this->return_statements)
-		{
-			return $statements;
-		}
-
-		// We could add error handling here...
-		foreach ($statements as $sql)
-		{
-			if ($sql === 'begin')
-			{
-				$this->db->sql_transaction('begin');
-			}
-			else if ($sql === 'commit')
-			{
-				$this->db->sql_transaction('commit');
-			}
-			else
-			{
-				$this->db->sql_query($sql);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Function to prepare some column information for better usage
-	* @access private
-	*/
-	function sql_prepare_column_data($table_name, $column_name, $column_data)
-	{
-		if (strlen($column_name) > 30)
-		{
-			trigger_error("Column name '$column_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
-		}
-
-		// Get type
-		if (strpos($column_data[0], ':') !== false)
-		{
-			list($orig_column_type, $column_length) = explode(':', $column_data[0]);
-			if (!is_array($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']))
-			{
-				$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'], $column_length);
-			}
-			else
-			{
-				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule']))
-				{
-					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][0])
-					{
-						case 'div':
-							$column_length /= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][1];
-							$column_length = ceil($column_length);
-							$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
-						break;
-					}
-				}
-
-				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit']))
-				{
-					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][0])
-					{
-						case 'mult':
-							$column_length *= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][1];
-							if ($column_length > $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][2])
-							{
-								$column_type = $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][3];
-							}
-							else
-							{
-								$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
-							}
-						break;
-					}
-				}
-			}
-			$orig_column_type .= ':';
-		}
-		else
-		{
-			$orig_column_type = $column_data[0];
-			$column_type = $this->dbms_type_map[$this->sql_layer][$column_data[0]];
-		}
-
-		// Adjust default value if db-dependant specified
-		if (is_array($column_data[1]))
-		{
-			$column_data[1] = (isset($column_data[1][$this->sql_layer])) ? $column_data[1][$this->sql_layer] : $column_data[1]['default'];
-		}
-
-		$sql = '';
-
-		$return_array = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql .= " {$column_type} ";
-				$return_array['column_type_sql_type'] = " {$column_type} ";
-
-				if (!is_null($column_data[1]))
-				{
-					$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-					$return_array['column_type_sql_default'] = ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-				}
-
-				$sql .= 'NOT NULL';
-
-				// This is a UNICODE column and thus should be given it's fair share
-				if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
-				{
-					$sql .= ' COLLATE UNICODE';
-				}
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$return_array['auto_increment'] = true;
-				}
-
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$sql .= " {$column_type} ";
-				$sql_default = " {$column_type} ";
-
-				// For adding columns we need the default definition
-				if (!is_null($column_data[1]))
-				{
-					// For hexadecimal values do not use single quotes
-					if (strpos($column_data[1], '0x') === 0)
-					{
-						$return_array['default'] = 'DEFAULT (' . $column_data[1] . ') ';
-						$sql_default .= $return_array['default'];
-					}
-					else
-					{
-						$return_array['default'] = 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
-						$sql_default .= $return_array['default'];
-					}
-				}
-
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-//					$sql .= 'IDENTITY (1, 1) ';
-					$sql_default .= 'IDENTITY (1, 1) ';
-				}
-
-				$return_array['textimage'] = $column_type === '[text]';
-
-				$sql .= 'NOT NULL';
-				$sql_default .= 'NOT NULL';
-
-				$return_array['column_type_sql_default'] = $sql_default;
-
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql .= " {$column_type} ";
-
-				// For hexadecimal values do not use single quotes
-				if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
-				{
-					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
-				}
-				$sql .= 'NOT NULL';
-
-				if (isset($column_data[2]))
-				{
-					if ($column_data[2] == 'auto_increment')
-					{
-						$sql .= ' auto_increment';
-					}
-					else if ($this->sql_layer === 'mysql_41' && $column_data[2] == 'true_sort')
-					{
-						$sql .= ' COLLATE utf8_unicode_ci';
-					}
-				}
-
-			break;
-
-			case 'oracle':
-				$sql .= " {$column_type} ";
-				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
-
-				// In Oracle empty strings ('') are treated as NULL.
-				// Therefore in oracle we allow NULL's for all DEFAULT '' entries
-				// Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields)
-				if (!preg_match('/number/i', $column_type))
-				{
-					$sql .= ($column_data[1] === '') ? '' : 'NOT NULL';
-				}
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$return_array['auto_increment'] = true;
-				}
-
-			break;
-
-			case 'postgres':
-				$return_array['column_type'] = $column_type;
-
-				$sql .= " {$column_type} ";
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$default_val = "nextval('{$table_name}_seq')";
-					$return_array['auto_increment'] = true;
-				}
-				else if (!is_null($column_data[1]))
-				{
-					$default_val = "'" . $column_data[1] . "'";
-					$return_array['null'] = 'NOT NULL';
-					$sql .= 'NOT NULL ';
-				}
-
-				$return_array['default'] = $default_val;
-
-				$sql .= "DEFAULT {$default_val}";
-
-				// Unsigned? Then add a CHECK contraint
-				if (in_array($orig_column_type, $this->unsigned_types))
-				{
-					$return_array['constraint'] = "CHECK ({$column_name} >= 0)";
-					$sql .= " CHECK ({$column_name} >= 0)";
-				}
-
-			break;
-
-			case 'sqlite':
-				$return_array['primary_key_set'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$sql .= ' INTEGER PRIMARY KEY';
-					$return_array['primary_key_set'] = true;
-				}
-				else
-				{
-					$sql .= ' ' . $column_type;
-				}
-
-				$sql .= ' NOT NULL ';
-				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
-
-			break;
-		}
-
-		$return_array['column_type_sql'] = $sql;
-
-		return $return_array;
-	}
-
-	/**
-	* Add new column
-	*/
-	function sql_column_add($table_name, $column_name, $column_data, $inline = false)
-	{
-		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				// Does not support AFTER statement, only POSITION (and there you need the column position)
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD "' . strtoupper($column_name) . '" ' . $column_data['column_type_sql'];
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				// Does not support AFTER, only through temporary table
-				$statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default'];
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$after = (!empty($column_data['after'])) ? ' AFTER ' . $column_data['after'] : '';
-				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'] . $after;
-			break;
-
-			case 'oracle':
-				// Does not support AFTER, only through temporary table
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'postgres':
-				// Does not support AFTER, only through temporary table
-
-				if (version_compare($this->db->sql_server_info(true), '8.0', '>='))
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql'];
-				}
-				else
-				{
-					// old versions cannot add columns with default and null information
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type'] . ' ' . $column_data['constraint'];
-
-					if (isset($column_data['null']))
-					{
-						if ($column_data['null'] == 'NOT NULL')
-						{
-							$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET NOT NULL';
-						}
-					}
-
-					if (isset($column_data['default']))
-					{
-						$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
-					}
-				}
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name . ' ' . $column_data['column_type_sql'];
-				}
-
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
-
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					$statements[] = 'begin';
-
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY')
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols;
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-					$statements[] = 'commit';
-				}
-				else
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $column_data['column_type_sql'] . ']';
-				}
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop column
-	*/
-	function sql_column_remove($table_name, $column_name, $inline = false)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP "' . strtoupper($column_name) . '"';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`';
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name;
-			break;
-
-			case 'postgres':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN "' . $column_name . '"';
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name;
-				}
-
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
-
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					$statements[] = 'begin';
-
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name)
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = $new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols);
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-					$statements[] = 'commit';
-				}
-				else
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
-				}
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop Index
-	*/
-	function sql_index_drop($table_name, $index_name)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'DROP INDEX ' . $table_name . '.' . $index_name;
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'DROP INDEX ' . $index_name . ' ON ' . $table_name;
-			break;
-
-			case 'firebird':
-			case 'oracle':
-			case 'postgres':
-			case 'sqlite':
-				$statements[] = 'DROP INDEX ' . $table_name . '_' . $index_name;
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add primary key
-	*/
-	function sql_create_primary_key($table_name, $column, $inline = false)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD ";
-				$sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED (";
-				$sql .= '[' . implode("],\n\t\t[", $column) . ']';
-				$sql .= ') ON [PRIMARY]';
-
-				$statements[] = $sql;
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')';
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column;
-				}
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					break;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$statements[] = 'begin';
-
-				// Create a backup table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$new_table_cols = trim($matches[1]);
-				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-				$column_list = array();
-
-				foreach ($old_table_cols as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-					$column_list[] = $entities[0];
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add unique index
-	*/
-	function sql_create_unique_index($table_name, $index_name, $column)
-	{
-		$statements = array();
-
-		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
-		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
-		{
-			$max_length = $table_prefix + 24;
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'oracle':
-			case 'sqlite':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add index
-	*/
-	function sql_create_index($table_name, $index_name, $column)
-	{
-		$statements = array();
-
-		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
-		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
-		{
-			$max_length = $table_prefix + 24;
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
-		}
-
-		// remove index length unless MySQL4
-		if ('mysql_40' != $this->sql_layer)
-		{
-			$column = preg_replace('#:.*$#', '', $column);
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'oracle':
-			case 'sqlite':
-				$statements[] = 'CREATE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mysql_40':
-				// add index size to definition as required by MySQL4
-				foreach ($column as $i => $col)
-				{
-					if (false !== strpos($col, ':'))
-					{
-						list($col, $index_size) = explode(':', $col);
-						$column[$i] = "$col($index_size)";
-					}
-				}
-			// no break
-			case 'mysql_41':
-				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Change column type (not name!)
-	*/
-	function sql_column_change($table_name, $column_name, $column_data, $inline = false)
-	{
-		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				// Change type...
-				if (!empty($column_data['column_type_sql_default']))
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" SET DEFAULT ' . ' ' . $column_data['column_type_sql_default'];
-				}
-				else
-				{
-					// TODO: try to change pkey without removing trigger, generator or constraints. ATM this query may fail.
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
-				}
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'ALTER TABLE [' . $table_name . '] ALTER COLUMN [' . $column_name . '] ' . $column_data['column_type_sql'];
-
-				if (!empty($column_data['default']))
-				{
-					// Using TRANSACT-SQL for this statement because we do not want to have colliding data if statements are executed at a later stage
-					$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)
-						SET @drop_default_name =
-							(SELECT so.name FROM sysobjects so
-							JOIN sysconstraints sc ON so.id = sc.constid
-							WHERE object_name(so.parent_obj) = '{$table_name}'
-								AND so.xtype = 'D'
-								AND sc.colid = (SELECT colid FROM syscolumns
-									WHERE id = object_id('{$table_name}')
-										AND name = '{$column_name}'))
-						IF @drop_default_name <> ''
-						BEGIN
-							SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'
-							EXEC(@cmd)
-						END
-						SET @cmd = 'ALTER TABLE [{$table_name}] ADD CONSTRAINT [DF_{$table_name}_{$column_name}_1] {$column_data['default']} FOR [{$column_name}]'
-						EXEC(@cmd)";
-				}
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql'];
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'postgres':
-				$sql = 'ALTER TABLE ' . $table_name . ' ';
-
-				$sql_array = array();
-				$sql_array[] = 'ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type'];
-
-				if (isset($column_data['null']))
-				{
-					if ($column_data['null'] == 'NOT NULL')
-					{
-						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL';
-					}
-					else if ($column_data['null'] == 'NULL')
-					{
-						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL';
-					}
-				}
-
-				if (isset($column_data['default']))
-				{
-					$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
-				}
-
-				// we don't want to double up on constraints if we change different number data types
-				if (isset($column_data['constraint']))
-				{
-					$constraint_sql = "SELECT consrc as constraint_data
-								FROM pg_constraint, pg_class bc
-								WHERE conrelid = bc.oid
-									AND bc.relname = '{$table_name}'
-									AND NOT EXISTS (
-										SELECT *
-											FROM pg_constraint as c, pg_inherits as i
-											WHERE i.inhrelid = pg_constraint.conrelid
-												AND c.conname = pg_constraint.conname
-												AND c.consrc = pg_constraint.consrc
-												AND c.conrelid = i.inhparent
-									)";
-
-					$constraint_exists = false;
-
-					$result = $this->db->sql_query($constraint_sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						if (trim($row['constraint_data']) == trim($column_data['constraint']))
-						{
-							$constraint_exists = true;
-							break;
-						}
-					}
-					$this->db->sql_freeresult($result);
-
-					if (!$constraint_exists)
-					{
-						$sql_array[] = 'ADD ' . $column_data['constraint'];
-					}
-				}
-
-				$sql .= implode(', ', $sql_array);
-
-				$statements[] = $sql;
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name . ' ' . $column_data['column_type_sql'];
-				}
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					break;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$statements[] = 'begin';
-
-				// Create a temp table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$new_table_cols = trim($matches[1]);
-				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-				$column_list = array();
-
-				foreach ($old_table_cols as $key => $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					$column_list[] = $entities[0];
-					if ($entities[0] == $column_name)
-					{
-						$old_table_cols[$key] = $column_name . ' ' . $column_data['column_type_sql'];
-					}
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-}
-
 ?>
-- 
cgit v1.2.1


From 5b5c2274232bee869548a17399645a70cf550577 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 8 Jul 2011 20:33:16 -0400
Subject: [ticket/10003] Use phpbb_db_tools in database_update.php.

Now that the copy of db tools has been deleted, change which
class name is used.

PHPBB3-10003
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index d73848c871..7b6deb5727 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -180,7 +180,7 @@ $db->sql_freeresult($result);
 
 // We do not include DB Tools here, because we can not be sure the file is up-to-date ;)
 // Instead, this file defines a clean db_tools version (we are also not able to provide a different file, else the database update will not work standalone)
-$db_tools = new updater_db_tools($db, true);
+$db_tools = new phpbb_db_tools($db, true);
 
 $database_update_info = database_update_info();
 
-- 
cgit v1.2.1


From fd728c2815d3e21f5f6022b973109a839fe0164f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 8 Jul 2011 20:36:39 -0400
Subject: [ticket/10003] Require db_tools.php in database_update.php.

Use require_updated to use the new version of db_tools if one
is present.

PHPBB3-10003
---
 phpBB/install/database_update.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7b6deb5727..8154155650 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -99,6 +99,8 @@ require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
+phpbb_require_updated('includes/db/db_tools.' . $phpEx);
+
 // new table constants are separately defined here in case the updater is run
 // before the files are updated
 if (!defined('LOGIN_ATTEMPT_TABLE'))
-- 
cgit v1.2.1


From 00f7db66f24327b6d115e18d1dad8bf48ea22290 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 9 Jul 2011 01:56:43 -0400
Subject: [ticket/10003] Fixed comment referring to db_tools duplication.

PHPBB3-10003
---
 phpBB/install/database_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 8154155650..36d8bab467 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -180,8 +180,8 @@ while ($row = $db->sql_fetchrow($result))
 }
 $db->sql_freeresult($result);
 
-// We do not include DB Tools here, because we can not be sure the file is up-to-date ;)
-// Instead, this file defines a clean db_tools version (we are also not able to provide a different file, else the database update will not work standalone)
+// phpbb_db_tools will be taken from new files (under install/update/new)
+// if possible, falling back to the board's copy.
 $db_tools = new phpbb_db_tools($db, true);
 
 $database_update_info = database_update_info();
-- 
cgit v1.2.1


From 766537035ea2f04c5aa3c59c15edc15f4ecd050f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 9 Jul 2011 15:28:33 +0200
Subject: [ticket/10258] Change the DOCTYPE to HTML5

PHPBB3-10258
---
 phpBB/install/database_update.php | 19 ++++++++-----------
 phpBB/install/index.php           |  7 ++++---
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index fc205d4e56..09e2417efa 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -205,13 +205,12 @@ $ga_forum_id = request_var('ga_forum_id', 0);
 if ($has_global && !$ga_forum_id)
 {
 	?>
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-	<html xmlns="http://www.w3.org/1999/xhtml" dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>" xml:lang="<?php echo $lang['USER_LANG']; ?>">
+	<!DOCTYPE html>
+	<html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>">
 	<head>
 
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	<meta http-equiv="content-language" content="<?php echo $lang['USER_LANG']; ?>" />
-	<meta http-equiv="content-style-type" content="text/css" />
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 	<meta http-equiv="imagetoolbar" content="no" />
 
 	<title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
@@ -259,13 +258,11 @@ if ($has_global && !$ga_forum_id)
 header('Content-type: text/html; charset=UTF-8');
 
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>" xml:lang="<?php echo $lang['USER_LANG']; ?>">
+<!DOCTYPE html>
+<html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>">
 <head>
-
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<meta http-equiv="content-language" content="<?php echo $lang['USER_LANG']; ?>" />
-<meta http-equiv="content-style-type" content="text/css" />
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta http-equiv="imagetoolbar" content="no" />
 
 <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index e8a63e857e..2cbe9212c0 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -554,10 +554,11 @@ class module
 			return;
 		}
 
-		echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-		echo '<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">';
+		echo '<!DOCTYPE html>';
+		echo '<html dir="ltr">';
 		echo '<head>';
-		echo '<meta http-equiv="content-type" content="text/html; charset=utf-8" />';
+		echo '<meta charset="utf-8">';
+		echo '<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">';
 		echo '<title>' . $lang['INST_ERR_FATAL'] . '</title>';
 		echo '<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />';
 		echo '</head>';
-- 
cgit v1.2.1


From f7b06ca12db9da519d49ce334eaf96573d003c0f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 9 Jul 2011 23:33:44 +0200
Subject: [feature/template-engine] Move template.php to includes/template

This allows making use of autoloading.

PHPBB3-9726
---
 phpBB/install/database_update.php | 1 -
 phpBB/install/index.php           | 1 -
 2 files changed, 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0d3e96f342..ca7ac8aad5 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -60,7 +60,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-require($phpbb_root_path . 'includes/template.' . $phpEx);
 require($phpbb_root_path . 'includes/session.' . $phpEx);
 require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 6618e42ae8..15f8c670a4 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -162,7 +162,6 @@ if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx))
 
 include($phpbb_root_path . 'includes/auth.' . $phpEx);
 include($phpbb_root_path . 'includes/session.' . $phpEx);
-include($phpbb_root_path . 'includes/template.' . $phpEx);
 include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
-- 
cgit v1.2.1


From e6572b766f7fd5f8547b28fd52d25e4a96cfc2cd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 10 Jul 2011 22:36:17 +0200
Subject: [prep-release-3.0.9] Bumping version number for 3.0.9 final.

---
 phpBB/install/database_update.php     | 8 +++++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 097f6302dc..e73f859758 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9-RC4');
+define('UPDATES_TO_VERSION', '3.0.9');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -981,6 +981,8 @@ function database_update_info()
 		'3.0.9-RC2'		=> array(),
 		// No changes from 3.0.9-RC3 to 3.0.9-RC4
 		'3.0.9-RC3'     => array(),
+		// No changes from 3.0.9-RC4 to 3.0.9
+		'3.0.9-RC4'     => array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
 	);
@@ -1986,6 +1988,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.9-RC3 to 3.0.9-RC4
 		case '3.0.9-RC3':
 		break;
+
+		// No changes from 3.0.9-RC4 to 3.0.9
+		case '3.0.9-RC4':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 1eb2f51645..0153bd8ec2 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-RC4');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9');
 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');
 
-- 
cgit v1.2.1


From 854c14f9f6ae78318e159e27724178579ff48dcc Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 10 Jul 2011 23:04:14 +0200
Subject: [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags

These meta tags are IE specific and do not validate as HTML5.

PHPBB3-10258
---
 phpBB/install/database_update.php | 4 ----
 phpBB/install/index.php           | 1 -
 2 files changed, 5 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 09e2417efa..b8fe493ab8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -210,8 +210,6 @@ if ($has_global && !$ga_forum_id)
 	<head>
 
 	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-	<meta http-equiv="imagetoolbar" content="no" />
 
 	<title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
@@ -262,8 +260,6 @@ header('Content-type: text/html; charset=UTF-8');
 <html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta http-equiv="imagetoolbar" content="no" />
 
 <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 2cbe9212c0..d8a953fd28 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -558,7 +558,6 @@ class module
 		echo '<html dir="ltr">';
 		echo '<head>';
 		echo '<meta charset="utf-8">';
-		echo '<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">';
 		echo '<title>' . $lang['INST_ERR_FATAL'] . '</title>';
 		echo '<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />';
 		echo '</head>';
-- 
cgit v1.2.1


From c945fc9355fca866bfb095a2e79c51408a709387 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 11 Jul 2011 09:55:18 +0200
Subject: [ticket/10155] Add jQuery, introduce global assets path

Add the jQuery JavaScript library to all pages, giving modifications
instant access and allowing for any future core JavaScript to take
advantage of it.

Also introduce a global /assets directory for assets that are shared
between styles.

PHPBB3-10155
---
 phpBB/install/index.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index e8a63e857e..98c54e4dd9 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -203,6 +203,7 @@ $config = new phpbb_config(array(
 ));
 
 $template->set_custom_template('../adm/style', 'admin');
+$template->assign_var('T_ASSETS_PATH', '../assets');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
 
 // the acp template is never stored in the database
-- 
cgit v1.2.1


From 136a932303d7d7a427043d1834b6df40dc219b0e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 12 Jul 2011 01:32:00 +0200
Subject: [ticket/10258] Remove the meta charset tag

The charset tag is useless, because if a charset content-type header is
present it takes precedence. And phpBB always sends such a header.

PHPBB3-10258
---
 phpBB/install/database_update.php | 3 ---
 phpBB/install/index.php           | 1 -
 2 files changed, 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b8fe493ab8..3f3ff59c5d 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -209,8 +209,6 @@ if ($has_global && !$ga_forum_id)
 	<html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>">
 	<head>
 
-	<meta charset="utf-8">
-
 	<title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
 	<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
@@ -259,7 +257,6 @@ header('Content-type: text/html; charset=UTF-8');
 <!DOCTYPE html>
 <html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>">
 <head>
-<meta charset="utf-8">
 
 <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index d8a953fd28..b2a2caa145 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -557,7 +557,6 @@ class module
 		echo '<!DOCTYPE html>';
 		echo '<html dir="ltr">';
 		echo '<head>';
-		echo '<meta charset="utf-8">';
 		echo '<title>' . $lang['INST_ERR_FATAL'] . '</title>';
 		echo '<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />';
 		echo '</head>';
-- 
cgit v1.2.1


From 541a7db1016560d77590b9265c63c10cdd7e01a5 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 13 Jul 2011 09:51:09 +0200
Subject: [ticket/7090] Update documented minimum PHP version to  5.2.0

PHPBB3-7090
---
 phpBB/install/index.php           | 5 ++---
 phpBB/install/install_install.php | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index e8a63e857e..cd3c8fbaa8 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -18,10 +18,9 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-// @todo Review this test and see if we can find out what it is which prevents PHP 4.2.x from even displaying the page with requirements on it
-if (version_compare(PHP_VERSION, '4.3.3') < 0)
+if (version_compare(PHP_VERSION, '5.2.0') < 0)
 {
-	die('You are running an unsupported PHP version. Please upgrade to PHP 4.3.3 or higher before trying to install phpBB 3.0');
+	die('You are running an unsupported PHP version. Please upgrade to PHP 5.2.0 or higher before trying to install phpBB 3.1');
 }
 
 function phpbb_require_updated($path, $optional = false)
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index e18ed43778..e36fc1c618 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -141,7 +141,7 @@ class install_install extends module
 		// Test the minimum PHP version
 		$php_version = PHP_VERSION;
 
-		if (version_compare($php_version, '4.3.3') < 0)
+		if (version_compare($php_version, '5.2.0') < 0)
 		{
 			$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
 		}
-- 
cgit v1.2.1


From 0bf6966c5228d446c4f0d3862619db0f619c7369 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 13 Jul 2011 19:20:16 +0200
Subject: [feature/request-class] Add server(), header() and is_ajax() to
 request

Extend the request class with helpers for reading server vars (server())
and HTTP request headers (header()). Refactor the existing code base
to make use of these helpers, make $_SERVER a deactivated super global.

Also introduce an is_ajax() method, which checks the X-Requested-With
header for the value 'XMLHttpRequest', which is sent by JavaScript
libraries, such as jQuery.

PHPBB3-9716
---
 phpBB/install/database_update.php |  4 ++--
 phpBB/install/index.php           | 16 +++++++++-------
 phpBB/install/install_install.php | 22 +++++++++++-----------
 3 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 615122da4f..d38802e380 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -144,9 +144,9 @@ $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false);
 unset($dbpasswd);
 
 $user->ip = '';
-if (!empty($_SERVER['REMOTE_ADDR']))
+if ($request->server('REMOTE_ADDR'))
 {
-	$user->ip = (function_exists('phpbb_ip_normalise')) ? phpbb_ip_normalise($_SERVER['REMOTE_ADDR']) : htmlspecialchars($_SERVER['REMOTE_ADDR']);
+	$user->ip = (function_exists('phpbb_ip_normalise')) ? phpbb_ip_normalise($request->server('REMOTE_ADDR')) : $request->server('REMOTE_ADDR', '', true);
 }
 
 $sql = "SELECT config_value
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index e8a63e857e..9928638fc4 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -100,9 +100,9 @@ request_var('', 0, false, false, $request); // "dependency injection" for a func
 // Try and load an appropriate language if required
 $language = basename(request_var('language', ''));
 
-if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !$language)
+if ($request->header('Accept-Language') && !$language)
 {
-	$accept_lang_ary = explode(',', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']));
+	$accept_lang_ary = explode(',', strtolower($request->header('Accept-Language')));
 	foreach ($accept_lang_ary as $accept_lang)
 	{
 		// Set correct format ... guess full xx_yy form
@@ -428,15 +428,17 @@ class module
 	*/
 	function redirect($page)
 	{
+		global $request;
+
 		// HTTP_HOST is having the correct browser url in most cases...
-		$server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
-		$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
-		$secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
+		$server_name = strtolower($request->header('Host', $request->server('SERVER_NAME')));
+		$server_port = $request->server('SERVER_PORT', 0);
+		$secure = ($request->server('HTTPS') == 'on') ? 1 : 0;
 
-		$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
+		$script_name = $request->server('PHP_SELF');
 		if (!$script_name)
 		{
-			$script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
+			$script_name = $request->server('REQUEST_URI');
 		}
 
 		// Replace backslashes and doubled slashes (could happen on some proxy setups)
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index e18ed43778..af3d414071 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -999,7 +999,7 @@ class install_install extends module
 	*/
 	function obtain_advanced_settings($mode, $sub)
 	{
-		global $lang, $template, $phpEx;
+		global $lang, $template, $phpEx, $request;
 
 		$this->page_title = $lang['STAGE_ADVANCED'];
 
@@ -1017,7 +1017,7 @@ class install_install extends module
 		$s_hidden_fields .= '<input type="hidden" name="language" value="' . $data['language'] . '" />';
 
 		// HTTP_HOST is having the correct browser url in most cases...
-		$server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
+		$server_name = strtolower($request->header('Host', $request->server('SERVER_NAME')));
 
 		// HTTP HOST can carry a port number...
 		if (strpos($server_name, ':') !== false)
@@ -1027,16 +1027,16 @@ class install_install extends module
 
 		$data['email_enable'] = ($data['email_enable'] !== '') ? $data['email_enable'] : true;
 		$data['server_name'] = ($data['server_name'] !== '') ? $data['server_name'] : $server_name;
-		$data['server_port'] = ($data['server_port'] !== '') ? $data['server_port'] : ((!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT'));
-		$data['server_protocol'] = ($data['server_protocol'] !== '') ? $data['server_protocol'] : ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://');
-		$data['cookie_secure'] = ($data['cookie_secure'] !== '') ? $data['cookie_secure'] : ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? true : false);
+		$data['server_port'] = ($data['server_port'] !== '') ? $data['server_port'] : $request->server('SERVER_PORT', 0);
+		$data['server_protocol'] = ($data['server_protocol'] !== '') ? $data['server_protocol'] : ($request->server('HTTPS') == 'on' ? 'https://' : 'http://');
+		$data['cookie_secure'] = ($data['cookie_secure'] !== '') ? $data['cookie_secure'] : ($request->server('HTTPS') == 'on' ? true : false);
 
 		if ($data['script_path'] === '')
 		{
-			$name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
+			$name = $request->server('PHP_SELF');
 			if (!$name)
 			{
-				$name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
+				$name = $request->server('REQUEST_URI');
 			}
 
 			// Replace backslashes and doubled slashes (could happen on some proxy setups)
@@ -1101,7 +1101,7 @@ class install_install extends module
 	*/
 	function load_schema($mode, $sub)
 	{
-		global $db, $lang, $template, $phpbb_root_path, $phpEx;
+		global $db, $lang, $template, $phpbb_root_path, $phpEx, $request;
 
 		$this->page_title = $lang['STAGE_CREATE_TABLE'];
 		$s_hidden_fields = '';
@@ -1117,8 +1117,8 @@ class install_install extends module
 		}
 
 		// HTTP_HOST is having the correct browser url in most cases...
-		$server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
-		$referer = (!empty($_SERVER['HTTP_REFERER'])) ? strtolower($_SERVER['HTTP_REFERER']) : getenv('HTTP_REFERER');
+		$server_name = strtolower($request->header('Host', $request->server('SERVER_NAME')));
+		$referer = strtolower($request->header('Referer'));
 
 		// HTTP HOST can carry a port number...
 		if (strpos($server_name, ':') !== false)
@@ -1235,7 +1235,7 @@ class install_install extends module
 
 		$current_time = time();
 
-		$user_ip = (!empty($_SERVER['REMOTE_ADDR'])) ? phpbb_ip_normalise($_SERVER['REMOTE_ADDR']) : '';
+		$user_ip = $request->server('REMOTE_ADDR') ? phpbb_ip_normalise($request->server('REMOTE_ADDR')) : '';
 
 		if ($data['script_path'] !== '/')
 		{
-- 
cgit v1.2.1


From 681c4a478d6eff7dbcebadca04f4afa28da750a8 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 29 Jul 2011 16:32:22 +0200
Subject: [ticket/10258] Add HTML5 meta charset tag

This allows knowing the charset when saving web pages to disk. Also, this is
supported by all browsers.

PHPBB3-10258
---
 phpBB/install/database_update.php | 2 ++
 phpBB/install/index.php           | 1 +
 2 files changed, 3 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index bf3dec5bab..79aa57aea0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -208,6 +208,7 @@ if ($has_global && !$ga_forum_id)
 	<!DOCTYPE html>
 	<html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>">
 	<head>
+	<meta charset="utf-8">
 
 	<title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
@@ -257,6 +258,7 @@ header('Content-type: text/html; charset=UTF-8');
 <!DOCTYPE html>
 <html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>">
 <head>
+<meta charset="utf-8">
 
 <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 9d241a9224..f4815c3108 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -556,6 +556,7 @@ class module
 		echo '<!DOCTYPE html>';
 		echo '<html dir="ltr">';
 		echo '<head>';
+		echo '<meta charset="utf-8">';
 		echo '<title>' . $lang['INST_ERR_FATAL'] . '</title>';
 		echo '<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />';
 		echo '</head>';
-- 
cgit v1.2.1


From 60372b43c2995ec82051c235587ddfff2501f620 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 9 Aug 2011 23:28:56 -0400
Subject: [feature/template-engine] Update installer for template engine
 changes.

PHPBB3-9726
---
 phpBB/install/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 15f8c670a4..0d1f2e1312 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -261,7 +261,6 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle
 
 $user = new user();
 $auth = new auth();
-$template = new phpbb_template();
 
 // Add own hook handler, if present. :o
 if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
@@ -284,6 +283,8 @@ $config = new phpbb_config(array(
 	'load_tplcompile'	=> '1'
 ));
 
+$template_locator = new phpbb_template_locator();
+$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $template_locator);
 $template->set_custom_template('../adm/style', 'admin');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
 
-- 
cgit v1.2.1


From f84460c710f528724fac68278361af7fe18e458c Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 18 Aug 2011 22:25:17 +0200
Subject: [feature/request-class] Make use of the is_secure() method

PHPBB3-9716
---
 phpBB/install/index.php           | 2 +-
 phpBB/install/install_install.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 9928638fc4..3c1ce359ca 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -433,7 +433,7 @@ class module
 		// HTTP_HOST is having the correct browser url in most cases...
 		$server_name = strtolower($request->header('Host', $request->server('SERVER_NAME')));
 		$server_port = $request->server('SERVER_PORT', 0);
-		$secure = ($request->server('HTTPS') == 'on') ? 1 : 0;
+		$secure = $request->is_secure() ? 1 : 0;
 
 		$script_name = $request->server('PHP_SELF');
 		if (!$script_name)
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index af3d414071..9be5466ef3 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1028,8 +1028,8 @@ class install_install extends module
 		$data['email_enable'] = ($data['email_enable'] !== '') ? $data['email_enable'] : true;
 		$data['server_name'] = ($data['server_name'] !== '') ? $data['server_name'] : $server_name;
 		$data['server_port'] = ($data['server_port'] !== '') ? $data['server_port'] : $request->server('SERVER_PORT', 0);
-		$data['server_protocol'] = ($data['server_protocol'] !== '') ? $data['server_protocol'] : ($request->server('HTTPS') == 'on' ? 'https://' : 'http://');
-		$data['cookie_secure'] = ($data['cookie_secure'] !== '') ? $data['cookie_secure'] : ($request->server('HTTPS') == 'on' ? true : false);
+		$data['server_protocol'] = ($data['server_protocol'] !== '') ? $data['server_protocol'] : ($request->is_secure() ? 'https://' : 'http://');
+		$data['cookie_secure'] = ($data['cookie_secure'] !== '') ? $data['cookie_secure'] : $request->is_secure();
 
 		if ($data['script_path'] === '')
 		{
-- 
cgit v1.2.1


From c5cef773c4811d2041c56a9c34da94a30f8190e1 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 18 Aug 2011 23:38:39 +0200
Subject: [feature/request-class] Adjust code base to do html decoding manually

PHPBB3-9716
---
 phpBB/install/database_update.php | 2 +-
 phpBB/install/index.php           | 6 +++---
 phpBB/install/install_install.php | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index cd060a0b2b..b69d44d7be 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -145,7 +145,7 @@ unset($dbpasswd);
 $user->ip = '';
 if ($request->server('REMOTE_ADDR'))
 {
-	$user->ip = (function_exists('phpbb_ip_normalise')) ? phpbb_ip_normalise($request->server('REMOTE_ADDR')) : $request->server('REMOTE_ADDR', '', true);
+	$user->ip = (function_exists('phpbb_ip_normalise')) ? phpbb_ip_normalise($request->server('REMOTE_ADDR')) : $request->server('REMOTE_ADDR');
 }
 
 $sql = "SELECT config_value
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index bba26fde7a..f43d95301f 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -430,14 +430,14 @@ class module
 		global $request;
 
 		// HTTP_HOST is having the correct browser url in most cases...
-		$server_name = strtolower($request->header('Host', $request->server('SERVER_NAME')));
+		$server_name = strtolower(htmlspecialchars_decode($request->header('Host', $request->server('SERVER_NAME'))));
 		$server_port = $request->server('SERVER_PORT', 0);
 		$secure = $request->is_secure() ? 1 : 0;
 
-		$script_name = $request->server('PHP_SELF');
+		$script_name = htmlspecialchars_decode($request->server('PHP_SELF'));
 		if (!$script_name)
 		{
-			$script_name = $request->server('REQUEST_URI');
+			$script_name = htmlspecialchars_decode($request->server('REQUEST_URI'));
 		}
 
 		// Replace backslashes and doubled slashes (could happen on some proxy setups)
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 12f541e5f8..1a69638220 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1017,7 +1017,7 @@ class install_install extends module
 		$s_hidden_fields .= '<input type="hidden" name="language" value="' . $data['language'] . '" />';
 
 		// HTTP_HOST is having the correct browser url in most cases...
-		$server_name = strtolower($request->header('Host', $request->server('SERVER_NAME')));
+		$server_name = strtolower(htmlspecialchars_decode($request->header('Host', $request->server('SERVER_NAME'))));
 
 		// HTTP HOST can carry a port number...
 		if (strpos($server_name, ':') !== false)
@@ -1033,10 +1033,10 @@ class install_install extends module
 
 		if ($data['script_path'] === '')
 		{
-			$name = $request->server('PHP_SELF');
+			$name = htmlspecialchars_decode($request->server('PHP_SELF'));
 			if (!$name)
 			{
-				$name = $request->server('REQUEST_URI');
+				$name = htmlspecialchars_decode($request->server('REQUEST_URI'));
 			}
 
 			// Replace backslashes and doubled slashes (could happen on some proxy setups)
@@ -1117,7 +1117,7 @@ class install_install extends module
 		}
 
 		// HTTP_HOST is having the correct browser url in most cases...
-		$server_name = strtolower($request->header('Host', $request->server('SERVER_NAME')));
+		$server_name = strtolower(htmlspecialchars_decode($request->header('Host', $request->server('SERVER_NAME'))));
 		$referer = strtolower($request->header('Referer'));
 
 		// HTTP HOST can carry a port number...
-- 
cgit v1.2.1


From 33adfd633b6fa92bbc6e0b4fd303e942d2923b6e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 3 Sep 2011 18:55:30 +0300
Subject: [feature/remove-imagesets] Changing database structure

Removing imagesets. Changing database structure

PHPBB3-10336
---
 phpBB/install/database_update.php         | 13 ++++++
 phpBB/install/install_install.php         | 66 ---------------------------
 phpBB/install/schemas/firebird_schema.sql | 53 +---------------------
 phpBB/install/schemas/mssql_schema.sql    | 53 +---------------------
 phpBB/install/schemas/mysql_40_schema.sql | 29 +-----------
 phpBB/install/schemas/mysql_41_schema.sql | 29 +-----------
 phpBB/install/schemas/oracle_schema.sql   | 67 ---------------------------
 phpBB/install/schemas/postgres_schema.sql | 35 ---------------
 phpBB/install/schemas/schema_data.sql     | 75 +------------------------------
 phpBB/install/schemas/sqlite_schema.sql   | 27 +----------
 10 files changed, 19 insertions(+), 428 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b69d44d7be..7f542974d9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1061,6 +1061,15 @@ function database_update_info()
 					'group_legend'		=> array('UINT', 0),
 				),
 			),
+			'drop_columns'      => array(
+			    STYLES_TABLE        => array(
+			        'imageset_id',
+                ),
+            ),
+            'drop_tables'       => array(
+                STYLES_IMAGESET_TABLE,
+                STYLES_IMAGESET_DATA_TABLE,
+            ),
 		),
 	);
 }
@@ -2128,6 +2137,10 @@ function change_database_data(&$no_updates, $version)
 			);
 
 			_add_modules($modules_to_install);
+			
+			$sql = 'DELETE FROM ' . MODULES_TABLE . "
+			    WHERE module_basename = 'styles' AND module_mode = 'imageset'";
+			_sql($sql, $errored, $error_ary);
 
 			// Localise Global Announcements
 			$sql = 'SELECT topic_id, topic_approved, (topic_replies + 1) AS topic_posts, topic_last_post_id, topic_last_post_subject, topic_last_post_time, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 1a69638220..db763f7a7c 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1742,72 +1742,6 @@ class install_install extends module
 					$error = $db->sql_error($db->sql_error_sql);
 					$this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__);
 				}
-
-				$valid_localized = array(
-					'icon_back_top', 'icon_contact_aim', 'icon_contact_email', 'icon_contact_icq', 'icon_contact_jabber', 'icon_contact_msnm', 'icon_contact_pm', 'icon_contact_yahoo', 'icon_contact_www', 'icon_post_delete', 'icon_post_edit', 'icon_post_info', 'icon_post_quote', 'icon_post_report', 'icon_user_online', 'icon_user_offline', 'icon_user_profile', 'icon_user_search', 'icon_user_warn', 'button_pm_forward', 'button_pm_new', 'button_pm_reply', 'button_topic_locked', 'button_topic_new', 'button_topic_reply',
-				);
-
-				$sql_ary = array();
-
-				$sql = 'SELECT *
-					FROM ' . STYLES_IMAGESET_TABLE;
-				$result = $db->sql_query($sql);
-
-				while ($imageset_row = $db->sql_fetchrow($result))
-				{
-					if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['lang_iso']}/imageset.cfg"))
-					{
-						$cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['lang_iso']}/imageset.cfg");
-						foreach ($cfg_data_imageset_data as $image_name => $value)
-						{
-							if (strpos($value, '*') !== false)
-							{
-								if (substr($value, -1, 1) === '*')
-								{
-									list($image_filename, $image_height) = explode('*', $value);
-									$image_width = 0;
-								}
-								else
-								{
-									list($image_filename, $image_height, $image_width) = explode('*', $value);
-								}
-							}
-							else
-							{
-								$image_filename = $value;
-								$image_height = $image_width = 0;
-							}
-
-							if (strpos($image_name, 'img_') === 0 && $image_filename)
-							{
-								$image_name = substr($image_name, 4);
-								if (in_array($image_name, $valid_localized))
-								{
-									$sql_ary[] = array(
-										'image_name'		=> (string) $image_name,
-										'image_filename'	=> (string) $image_filename,
-										'image_height'		=> (int) $image_height,
-										'image_width'		=> (int) $image_width,
-										'imageset_id'		=> (int) $imageset_row['imageset_id'],
-										'image_lang'		=> (string) $lang_pack['lang_iso'],
-									);
-								}
-							}
-						}
-					}
-				}
-				$db->sql_freeresult($result);
-
-				if (sizeof($sql_ary))
-				{
-					$db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
-
-					if ($db->sql_error_triggered)
-					{
-						$error = $db->sql_error($db->sql_error_sql);
-						$this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__);
-					}
-				}
 			}
 		}
 		closedir($dir);
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index b19ece2b7c..b5a081bce4 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1077,8 +1077,7 @@ CREATE TABLE phpbb_styles (
 	style_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	style_active INTEGER DEFAULT 1 NOT NULL,
 	template_id INTEGER DEFAULT 0 NOT NULL,
-	theme_id INTEGER DEFAULT 0 NOT NULL,
-	imageset_id INTEGER DEFAULT 0 NOT NULL
+	theme_id INTEGER DEFAULT 0 NOT NULL
 );;
 
 ALTER TABLE phpbb_styles ADD PRIMARY KEY (style_id);;
@@ -1086,7 +1085,6 @@ ALTER TABLE phpbb_styles ADD PRIMARY KEY (style_id);;
 CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles(style_name);;
 CREATE INDEX phpbb_styles_template_id ON phpbb_styles(template_id);;
 CREATE INDEX phpbb_styles_theme_id ON phpbb_styles(theme_id);;
-CREATE INDEX phpbb_styles_imageset_id ON phpbb_styles(imageset_id);;
 
 CREATE GENERATOR phpbb_styles_gen;;
 SET GENERATOR phpbb_styles_gen TO 0;;
@@ -1164,55 +1162,6 @@ BEGIN
 END;;
 
 
-# Table: 'phpbb_styles_imageset'
-CREATE TABLE phpbb_styles_imageset (
-	imageset_id INTEGER NOT NULL,
-	imageset_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
-	imageset_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
-	imageset_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL
-);;
-
-ALTER TABLE phpbb_styles_imageset ADD PRIMARY KEY (imageset_id);;
-
-CREATE UNIQUE INDEX phpbb_styles_imageset_imgset_nm ON phpbb_styles_imageset(imageset_name);;
-
-CREATE GENERATOR phpbb_styles_imageset_gen;;
-SET GENERATOR phpbb_styles_imageset_gen TO 0;;
-
-CREATE TRIGGER t_phpbb_styles_imageset FOR phpbb_styles_imageset
-BEFORE INSERT
-AS
-BEGIN
-	NEW.imageset_id = GEN_ID(phpbb_styles_imageset_gen, 1);
-END;;
-
-
-# Table: 'phpbb_styles_imageset_data'
-CREATE TABLE phpbb_styles_imageset_data (
-	image_id INTEGER NOT NULL,
-	image_name VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	image_filename VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	image_lang VARCHAR(30) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	image_height INTEGER DEFAULT 0 NOT NULL,
-	image_width INTEGER DEFAULT 0 NOT NULL,
-	imageset_id INTEGER DEFAULT 0 NOT NULL
-);;
-
-ALTER TABLE phpbb_styles_imageset_data ADD PRIMARY KEY (image_id);;
-
-CREATE INDEX phpbb_styles_imageset_data_i_d ON phpbb_styles_imageset_data(imageset_id);;
-
-CREATE GENERATOR phpbb_styles_imageset_data_gen;;
-SET GENERATOR phpbb_styles_imageset_data_gen TO 0;;
-
-CREATE TRIGGER t_phpbb_styles_imageset_data FOR phpbb_styles_imageset_data
-BEFORE INSERT
-AS
-BEGIN
-	NEW.image_id = GEN_ID(phpbb_styles_imageset_data_gen, 1);
-END;;
-
-
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
 	topic_id INTEGER NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index f823667252..d0260ce9c5 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1307,8 +1307,7 @@ CREATE TABLE [phpbb_styles] (
 	[style_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[style_active] [int] DEFAULT (1) NOT NULL ,
 	[template_id] [int] DEFAULT (0) NOT NULL ,
-	[theme_id] [int] DEFAULT (0) NOT NULL ,
-	[imageset_id] [int] DEFAULT (0) NOT NULL 
+	[theme_id] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -1328,9 +1327,6 @@ GO
 CREATE  INDEX [theme_id] ON [phpbb_styles]([theme_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [imageset_id] ON [phpbb_styles]([imageset_id]) ON [PRIMARY]
-GO
-
 
 /*
 	Table: 'phpbb_styles_template'
@@ -1402,53 +1398,6 @@ CREATE  UNIQUE  INDEX [theme_name] ON [phpbb_styles_theme]([theme_name]) ON [PRI
 GO
 
 
-/*
-	Table: 'phpbb_styles_imageset'
-*/
-CREATE TABLE [phpbb_styles_imageset] (
-	[imageset_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[imageset_name] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[imageset_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[imageset_path] [varchar] (100) DEFAULT ('') NOT NULL 
-) ON [PRIMARY]
-GO
-
-ALTER TABLE [phpbb_styles_imageset] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_styles_imageset] PRIMARY KEY  CLUSTERED 
-	(
-		[imageset_id]
-	)  ON [PRIMARY] 
-GO
-
-CREATE  UNIQUE  INDEX [imgset_nm] ON [phpbb_styles_imageset]([imageset_name]) ON [PRIMARY]
-GO
-
-
-/*
-	Table: 'phpbb_styles_imageset_data'
-*/
-CREATE TABLE [phpbb_styles_imageset_data] (
-	[image_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[image_name] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[image_filename] [varchar] (200) DEFAULT ('') NOT NULL ,
-	[image_lang] [varchar] (30) DEFAULT ('') NOT NULL ,
-	[image_height] [int] DEFAULT (0) NOT NULL ,
-	[image_width] [int] DEFAULT (0) NOT NULL ,
-	[imageset_id] [int] DEFAULT (0) NOT NULL 
-) ON [PRIMARY]
-GO
-
-ALTER TABLE [phpbb_styles_imageset_data] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_styles_imageset_data] PRIMARY KEY  CLUSTERED 
-	(
-		[image_id]
-	)  ON [PRIMARY] 
-GO
-
-CREATE  INDEX [i_d] ON [phpbb_styles_imageset_data]([imageset_id]) ON [PRIMARY]
-GO
-
-
 /*
 	Table: 'phpbb_topics'
 */
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 8b603f9572..276a2cb2a2 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -752,12 +752,10 @@ CREATE TABLE phpbb_styles (
 	style_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	template_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	theme_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	imageset_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (style_id),
 	UNIQUE style_name (style_name(255)),
 	KEY template_id (template_id),
-	KEY theme_id (theme_id),
-	KEY imageset_id (imageset_id)
+	KEY theme_id (theme_id)
 );
 
 
@@ -802,31 +800,6 @@ CREATE TABLE phpbb_styles_theme (
 );
 
 
-# Table: 'phpbb_styles_imageset'
-CREATE TABLE phpbb_styles_imageset (
-	imageset_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	imageset_name blob NOT NULL,
-	imageset_copyright blob NOT NULL,
-	imageset_path varbinary(100) DEFAULT '' NOT NULL,
-	PRIMARY KEY (imageset_id),
-	UNIQUE imgset_nm (imageset_name(255))
-);
-
-
-# Table: 'phpbb_styles_imageset_data'
-CREATE TABLE phpbb_styles_imageset_data (
-	image_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	image_name varbinary(200) DEFAULT '' NOT NULL,
-	image_filename varbinary(200) DEFAULT '' NOT NULL,
-	image_lang varbinary(30) DEFAULT '' NOT NULL,
-	image_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	imageset_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (image_id),
-	KEY i_d (imageset_id)
-);
-
-
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
 	topic_id mediumint(8) UNSIGNED NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index f418e1d2a5..b3f903e0fb 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -752,12 +752,10 @@ CREATE TABLE phpbb_styles (
 	style_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	template_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	theme_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	imageset_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (style_id),
 	UNIQUE style_name (style_name),
 	KEY template_id (template_id),
-	KEY theme_id (theme_id),
-	KEY imageset_id (imageset_id)
+	KEY theme_id (theme_id)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
@@ -802,31 +800,6 @@ CREATE TABLE phpbb_styles_theme (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
-# Table: 'phpbb_styles_imageset'
-CREATE TABLE phpbb_styles_imageset (
-	imageset_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	imageset_name varchar(255) DEFAULT '' NOT NULL,
-	imageset_copyright varchar(255) DEFAULT '' NOT NULL,
-	imageset_path varchar(100) DEFAULT '' NOT NULL,
-	PRIMARY KEY (imageset_id),
-	UNIQUE imgset_nm (imageset_name)
-) CHARACTER SET `utf8` COLLATE `utf8_bin`;
-
-
-# Table: 'phpbb_styles_imageset_data'
-CREATE TABLE phpbb_styles_imageset_data (
-	image_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	image_name varchar(200) DEFAULT '' NOT NULL,
-	image_filename varchar(200) DEFAULT '' NOT NULL,
-	image_lang varchar(30) DEFAULT '' NOT NULL,
-	image_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
-	imageset_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (image_id),
-	KEY i_d (imageset_id)
-) CHARACTER SET `utf8` COLLATE `utf8_bin`;
-
-
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
 	topic_id mediumint(8) UNSIGNED NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index fcd7f9e5d0..be71095724 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1432,7 +1432,6 @@ CREATE TABLE phpbb_styles (
 	style_active number(1) DEFAULT '1' NOT NULL,
 	template_id number(8) DEFAULT '0' NOT NULL,
 	theme_id number(8) DEFAULT '0' NOT NULL,
-	imageset_id number(8) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_styles PRIMARY KEY (style_id),
 	CONSTRAINT u_phpbb_style_name UNIQUE (style_name)
 )
@@ -1442,8 +1441,6 @@ CREATE INDEX phpbb_styles_template_id ON phpbb_styles (template_id)
 /
 CREATE INDEX phpbb_styles_theme_id ON phpbb_styles (theme_id)
 /
-CREATE INDEX phpbb_styles_imageset_id ON phpbb_styles (imageset_id)
-/
 
 CREATE SEQUENCE phpbb_styles_seq
 /
@@ -1545,70 +1542,6 @@ END;
 /
 
 
-/*
-	Table: 'phpbb_styles_imageset'
-*/
-CREATE TABLE phpbb_styles_imageset (
-	imageset_id number(8) NOT NULL,
-	imageset_name varchar2(765) DEFAULT '' ,
-	imageset_copyright varchar2(765) DEFAULT '' ,
-	imageset_path varchar2(100) DEFAULT '' ,
-	CONSTRAINT pk_phpbb_styles_imageset PRIMARY KEY (imageset_id),
-	CONSTRAINT u_phpbb_imgset_nm UNIQUE (imageset_name)
-)
-/
-
-
-CREATE SEQUENCE phpbb_styles_imageset_seq
-/
-
-CREATE OR REPLACE TRIGGER t_phpbb_styles_imageset
-BEFORE INSERT ON phpbb_styles_imageset
-FOR EACH ROW WHEN (
-	new.imageset_id IS NULL OR new.imageset_id = 0
-)
-BEGIN
-	SELECT phpbb_styles_imageset_seq.nextval
-	INTO :new.imageset_id
-	FROM dual;
-END;
-/
-
-
-/*
-	Table: 'phpbb_styles_imageset_data'
-*/
-CREATE TABLE phpbb_styles_imageset_data (
-	image_id number(8) NOT NULL,
-	image_name varchar2(200) DEFAULT '' ,
-	image_filename varchar2(200) DEFAULT '' ,
-	image_lang varchar2(30) DEFAULT '' ,
-	image_height number(4) DEFAULT '0' NOT NULL,
-	image_width number(4) DEFAULT '0' NOT NULL,
-	imageset_id number(8) DEFAULT '0' NOT NULL,
-	CONSTRAINT pk_phpbb_styles_imageset_data PRIMARY KEY (image_id)
-)
-/
-
-CREATE INDEX phpbb_styles_imageset_data_i_d ON phpbb_styles_imageset_data (imageset_id)
-/
-
-CREATE SEQUENCE phpbb_styles_imageset_data_seq
-/
-
-CREATE OR REPLACE TRIGGER t_phpbb_styles_imageset_data
-BEFORE INSERT ON phpbb_styles_imageset_data
-FOR EACH ROW WHEN (
-	new.image_id IS NULL OR new.image_id = 0
-)
-BEGIN
-	SELECT phpbb_styles_imageset_data_seq.nextval
-	INTO :new.image_id
-	FROM dual;
-END;
-/
-
-
 /*
 	Table: 'phpbb_topics'
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 1aa47b4d61..13a00d2ebc 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -983,14 +983,12 @@ CREATE TABLE phpbb_styles (
 	style_active INT2 DEFAULT '1' NOT NULL CHECK (style_active >= 0),
 	template_id INT4 DEFAULT '0' NOT NULL CHECK (template_id >= 0),
 	theme_id INT4 DEFAULT '0' NOT NULL CHECK (theme_id >= 0),
-	imageset_id INT4 DEFAULT '0' NOT NULL CHECK (imageset_id >= 0),
 	PRIMARY KEY (style_id)
 );
 
 CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name);
 CREATE INDEX phpbb_styles_template_id ON phpbb_styles (template_id);
 CREATE INDEX phpbb_styles_theme_id ON phpbb_styles (theme_id);
-CREATE INDEX phpbb_styles_imageset_id ON phpbb_styles (imageset_id);
 
 /*
 	Table: 'phpbb_styles_template'
@@ -1043,39 +1041,6 @@ CREATE TABLE phpbb_styles_theme (
 
 CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme (theme_name);
 
-/*
-	Table: 'phpbb_styles_imageset'
-*/
-CREATE SEQUENCE phpbb_styles_imageset_seq;
-
-CREATE TABLE phpbb_styles_imageset (
-	imageset_id INT4 DEFAULT nextval('phpbb_styles_imageset_seq'),
-	imageset_name varchar(255) DEFAULT '' NOT NULL,
-	imageset_copyright varchar(255) DEFAULT '' NOT NULL,
-	imageset_path varchar(100) DEFAULT '' NOT NULL,
-	PRIMARY KEY (imageset_id)
-);
-
-CREATE UNIQUE INDEX phpbb_styles_imageset_imgset_nm ON phpbb_styles_imageset (imageset_name);
-
-/*
-	Table: 'phpbb_styles_imageset_data'
-*/
-CREATE SEQUENCE phpbb_styles_imageset_data_seq;
-
-CREATE TABLE phpbb_styles_imageset_data (
-	image_id INT4 DEFAULT nextval('phpbb_styles_imageset_data_seq'),
-	image_name varchar(200) DEFAULT '' NOT NULL,
-	image_filename varchar(200) DEFAULT '' NOT NULL,
-	image_lang varchar(30) DEFAULT '' NOT NULL,
-	image_height INT2 DEFAULT '0' NOT NULL CHECK (image_height >= 0),
-	image_width INT2 DEFAULT '0' NOT NULL CHECK (image_width >= 0),
-	imageset_id INT4 DEFAULT '0' NOT NULL CHECK (imageset_id >= 0),
-	PRIMARY KEY (image_id)
-);
-
-CREATE INDEX phpbb_styles_imageset_data_i_d ON phpbb_styles_imageset_data (imageset_id);
-
 /*
 	Table: 'phpbb_topics'
 */
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index db66916b98..0d6409991f 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -434,80 +434,7 @@ INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order)
 INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', 10);
 
 # -- phpbb_styles
-INSERT INTO phpbb_styles (style_name, style_copyright, style_active, template_id, theme_id, imageset_id) VALUES ('prosilver', '&copy; phpBB Group', 1, 1, 1, 1);
-
-# -- phpbb_styles_imageset
-INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path) VALUES ('prosilver', '&copy; phpBB Group', 'prosilver');
-
-# -- phpbb_styles_imageset_data
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('site_logo', 'site_logo.gif', '', 52, 139, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_link', 'forum_link.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read', 'forum_read.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_locked', 'forum_read_locked.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_subforum', 'forum_read_subforum.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread', 'forum_unread.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_locked', 'forum_unread_locked.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_subforum', 'forum_unread_subforum.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_moved', 'topic_moved.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read', 'topic_read.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_mine', 'topic_read_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot', 'topic_read_hot.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot_mine', 'topic_read_hot_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked', 'topic_read_locked.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked_mine', 'topic_read_locked_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread', 'topic_unread.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_mine', 'topic_unread_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot', 'topic_unread_hot.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot_mine', 'topic_unread_hot_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked', 'topic_unread_locked.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked_mine', 'topic_unread_locked_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read', 'sticky_read.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_mine', 'sticky_read_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked', 'sticky_read_locked.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked_mine', 'sticky_read_locked_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread', 'sticky_unread.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_mine', 'sticky_unread_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked', 'sticky_unread_locked.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked_mine', 'sticky_unread_locked_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read', 'announce_read.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_mine', 'announce_read_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked', 'announce_read_locked.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked_mine', 'announce_read_locked_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread', 'announce_unread.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_mine', 'announce_unread_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked', 'announce_unread_locked.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read', 'announce_read.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_mine', 'announce_read_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked', 'announce_read_locked.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked_mine', 'announce_read_locked_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread', 'announce_unread.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_mine', 'announce_unread_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked', 'announce_unread_locked.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_read', 'topic_read.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_unread', 'topic_unread.gif', '', 27, 27, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_back_top', 'icon_back_top.gif', '', 11, 11, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_aim', 'icon_contact_aim.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_email', 'icon_contact_email.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_icq', 'icon_contact_icq.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_jabber', 'icon_contact_jabber.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_msnm', 'icon_contact_msnm.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_www', 'icon_contact_www.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_yahoo', 'icon_contact_yahoo.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_delete', 'icon_post_delete.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_info', 'icon_post_info.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_report', 'icon_post_report.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target', 'icon_post_target.gif', '', 9, 11, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target_unread', 'icon_post_target_unread.gif', '', 9, 11, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_attach', 'icon_topic_attach.gif', '', 10, 7, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_latest', 'icon_topic_latest.gif', '', 9, 11, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_newest', 'icon_topic_newest.gif', '', 9, 11, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_reported', 'icon_topic_reported.gif', '', 14, 16, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_unapproved', 'icon_topic_unapproved.gif', '', 14, 16, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_warn', 'icon_user_warn.gif', '', 20, 20, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('subforum_read', 'subforum_read.gif', '', 9, 11, 1);
-INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('subforum_unread', 'subforum_unread.gif', '', 9, 11, 1);
+INSERT INTO phpbb_styles (style_name, style_copyright, style_active, template_id, theme_id) VALUES ('prosilver', '&copy; phpBB Group', 1, 1, 1);
 
 # -- phpbb_styles_template
 INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield, template_storedb) VALUES ('prosilver', '&copy; phpBB Group', 'prosilver', 'lNg=', 0);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 382e835767..ce9bad13ce 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -727,14 +727,12 @@ CREATE TABLE phpbb_styles (
 	style_copyright varchar(255) NOT NULL DEFAULT '',
 	style_active INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	template_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	theme_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	imageset_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
+	theme_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
 );
 
 CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name);
 CREATE INDEX phpbb_styles_template_id ON phpbb_styles (template_id);
 CREATE INDEX phpbb_styles_theme_id ON phpbb_styles (theme_id);
-CREATE INDEX phpbb_styles_imageset_id ON phpbb_styles (imageset_id);
 
 # Table: 'phpbb_styles_template'
 CREATE TABLE phpbb_styles_template (
@@ -775,29 +773,6 @@ CREATE TABLE phpbb_styles_theme (
 
 CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme (theme_name);
 
-# Table: 'phpbb_styles_imageset'
-CREATE TABLE phpbb_styles_imageset (
-	imageset_id INTEGER PRIMARY KEY NOT NULL ,
-	imageset_name varchar(255) NOT NULL DEFAULT '',
-	imageset_copyright varchar(255) NOT NULL DEFAULT '',
-	imageset_path varchar(100) NOT NULL DEFAULT ''
-);
-
-CREATE UNIQUE INDEX phpbb_styles_imageset_imgset_nm ON phpbb_styles_imageset (imageset_name);
-
-# Table: 'phpbb_styles_imageset_data'
-CREATE TABLE phpbb_styles_imageset_data (
-	image_id INTEGER PRIMARY KEY NOT NULL ,
-	image_name varchar(200) NOT NULL DEFAULT '',
-	image_filename varchar(200) NOT NULL DEFAULT '',
-	image_lang varchar(30) NOT NULL DEFAULT '',
-	image_height INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	image_width INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	imageset_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
-);
-
-CREATE INDEX phpbb_styles_imageset_data_i_d ON phpbb_styles_imageset_data (imageset_id);
-
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
 	topic_id INTEGER PRIMARY KEY NOT NULL ,
-- 
cgit v1.2.1


From 9e4349e7faac65403de02fd090a837fee92b764a Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Thu, 4 Sep 2008 11:39:25 +0000
Subject: [feature/remove-db-styles] Removed database storage of style
 components.

The bulk of database storage of templates is removed, rendering template
stored in the database as useless.

Theme database storage is reduced to a skeleton for full removal soon.

This commit was cherry picked from the old feature/ascraeus-experiment branch
the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.

PHPBB3-9741
---
 phpBB/install/index.php               | 3 ---
 phpBB/install/install_update.php      | 3 ---
 phpBB/install/schemas/schema_data.sql | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 059b46650c..a4ff93e701 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -205,9 +205,6 @@ $template->set_custom_template('../adm/style', 'admin');
 $template->assign_var('T_ASSETS_PATH', '../assets');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
 
-// the acp template is never stored in the database
-$user->theme['template_storedb'] = false;
-
 $install = new module();
 
 $install->create('install', "index.$phpEx", $mode, $sub);
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 5c3a38d237..926b7cad46 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -134,9 +134,6 @@ class install_update extends module
 		// Set custom template again. ;)
 		$template->set_custom_template('../adm/style', 'admin');
 
-		// still, the acp template is never stored in the database
-		$user->theme['template_storedb'] = false;
-
 		$template->assign_vars(array(
 			'S_USER_LANG'			=> $user->lang['USER_LANG'],
 			'S_CONTENT_DIRECTION'	=> $user->lang['DIRECTION'],
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 0d6409991f..cd4e80ba13 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -437,7 +437,7 @@ INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order)
 INSERT INTO phpbb_styles (style_name, style_copyright, style_active, template_id, theme_id) VALUES ('prosilver', '&copy; phpBB Group', 1, 1, 1);
 
 # -- phpbb_styles_template
-INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield, template_storedb) VALUES ('prosilver', '&copy; phpBB Group', 'prosilver', 'lNg=', 0);
+INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield) VALUES ('prosilver', '&copy; phpBB Group', 'prosilver', 'lNg=');
 
 # -- phpbb_styles_theme
 INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path, theme_storedb, theme_data) VALUES ('prosilver', '&copy; phpBB Group', 'prosilver', 1, '');
-- 
cgit v1.2.1


From 270cd839a6519e54ac7f3a02a132854dbc4107af Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Tue, 20 Sep 2011 20:08:27 +0100
Subject: [feature/remove-db-styles] Update database schemas.

Removes:
* styles_template_data table
* template_storedb on styles_template table
* On styles_theme table:
  - theme_storedb
  - theme_mtime
  - theme_data

PHPBB3-9741
---
 phpBB/install/schemas/firebird_schema.sql | 18 +-----------------
 phpBB/install/schemas/mssql_schema.sql    | 27 ++-------------------------
 phpBB/install/schemas/mysql_40_schema.sql | 16 ----------------
 phpBB/install/schemas/mysql_41_schema.sql | 16 ----------------
 phpBB/install/schemas/oracle_schema.sql   | 21 ---------------------
 phpBB/install/schemas/postgres_schema.sql | 18 ------------------
 phpBB/install/schemas/schema_data.sql     |  2 +-
 phpBB/install/schemas/sqlite_schema.sql   | 18 +-----------------
 8 files changed, 5 insertions(+), 131 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index b5a081bce4..67e5547bb6 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1104,7 +1104,6 @@ CREATE TABLE phpbb_styles_template (
 	template_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	template_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT 'kNg=' NOT NULL,
-	template_storedb INTEGER DEFAULT 0 NOT NULL,
 	template_inherits_id INTEGER DEFAULT 0 NOT NULL,
 	template_inherit_path VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
 );;
@@ -1124,27 +1123,12 @@ BEGIN
 END;;
 
 
-# Table: 'phpbb_styles_template_data'
-CREATE TABLE phpbb_styles_template_data (
-	template_id INTEGER DEFAULT 0 NOT NULL,
-	template_filename VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	template_included BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL,
-	template_mtime INTEGER DEFAULT 0 NOT NULL,
-	template_data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
-);;
-
-CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data(template_id);;
-CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data(template_filename);;
-
 # Table: 'phpbb_styles_theme'
 CREATE TABLE phpbb_styles_theme (
 	theme_id INTEGER NOT NULL,
 	theme_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	theme_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
-	theme_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	theme_storedb INTEGER DEFAULT 0 NOT NULL,
-	theme_mtime INTEGER DEFAULT 0 NOT NULL,
-	theme_data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
+	theme_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_styles_theme ADD PRIMARY KEY (theme_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index d0260ce9c5..fe69670ded 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1337,7 +1337,6 @@ CREATE TABLE [phpbb_styles_template] (
 	[template_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[template_path] [varchar] (100) DEFAULT ('') NOT NULL ,
 	[bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL ,
-	[template_storedb] [int] DEFAULT (0) NOT NULL ,
 	[template_inherits_id] [int] DEFAULT (0) NOT NULL ,
 	[template_inherit_path] [varchar] (255) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
@@ -1354,25 +1353,6 @@ CREATE  UNIQUE  INDEX [tmplte_nm] ON [phpbb_styles_template]([template_name]) ON
 GO
 
 
-/*
-	Table: 'phpbb_styles_template_data'
-*/
-CREATE TABLE [phpbb_styles_template_data] (
-	[template_id] [int] DEFAULT (0) NOT NULL ,
-	[template_filename] [varchar] (100) DEFAULT ('') NOT NULL ,
-	[template_included] [varchar] (8000) DEFAULT ('') NOT NULL ,
-	[template_mtime] [int] DEFAULT (0) NOT NULL ,
-	[template_data] [text] DEFAULT ('') NOT NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-GO
-
-CREATE  INDEX [tid] ON [phpbb_styles_template_data]([template_id]) ON [PRIMARY]
-GO
-
-CREATE  INDEX [tfn] ON [phpbb_styles_template_data]([template_filename]) ON [PRIMARY]
-GO
-
-
 /*
 	Table: 'phpbb_styles_theme'
 */
@@ -1380,11 +1360,8 @@ CREATE TABLE [phpbb_styles_theme] (
 	[theme_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[theme_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[theme_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[theme_path] [varchar] (100) DEFAULT ('') NOT NULL ,
-	[theme_storedb] [int] DEFAULT (0) NOT NULL ,
-	[theme_mtime] [int] DEFAULT (0) NOT NULL ,
-	[theme_data] [text] DEFAULT ('') NOT NULL 
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+	[theme_path] [varchar] (100) DEFAULT ('') NOT NULL 
+) ON [PRIMARY]
 GO
 
 ALTER TABLE [phpbb_styles_theme] WITH NOCHECK ADD 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 276a2cb2a2..da6ce35be3 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -766,7 +766,6 @@ CREATE TABLE phpbb_styles_template (
 	template_copyright blob NOT NULL,
 	template_path varbinary(100) DEFAULT '' NOT NULL,
 	bbcode_bitfield varbinary(255) DEFAULT 'kNg=' NOT NULL,
-	template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	template_inherits_id int(4) UNSIGNED DEFAULT '0' NOT NULL,
 	template_inherit_path varbinary(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (template_id),
@@ -774,27 +773,12 @@ CREATE TABLE phpbb_styles_template (
 );
 
 
-# Table: 'phpbb_styles_template_data'
-CREATE TABLE phpbb_styles_template_data (
-	template_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	template_filename varbinary(100) DEFAULT '' NOT NULL,
-	template_included blob NOT NULL,
-	template_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	template_data mediumblob NOT NULL,
-	KEY tid (template_id),
-	KEY tfn (template_filename)
-);
-
-
 # Table: 'phpbb_styles_theme'
 CREATE TABLE phpbb_styles_theme (
 	theme_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	theme_name blob NOT NULL,
 	theme_copyright blob NOT NULL,
 	theme_path varbinary(100) DEFAULT '' NOT NULL,
-	theme_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	theme_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	theme_data mediumblob NOT NULL,
 	PRIMARY KEY (theme_id),
 	UNIQUE theme_name (theme_name(255))
 );
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index b3f903e0fb..cdbe377178 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -766,7 +766,6 @@ CREATE TABLE phpbb_styles_template (
 	template_copyright varchar(255) DEFAULT '' NOT NULL,
 	template_path varchar(100) DEFAULT '' NOT NULL,
 	bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL,
-	template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	template_inherits_id int(4) UNSIGNED DEFAULT '0' NOT NULL,
 	template_inherit_path varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (template_id),
@@ -774,27 +773,12 @@ CREATE TABLE phpbb_styles_template (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
-# Table: 'phpbb_styles_template_data'
-CREATE TABLE phpbb_styles_template_data (
-	template_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	template_filename varchar(100) DEFAULT '' NOT NULL,
-	template_included text NOT NULL,
-	template_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	template_data mediumtext NOT NULL,
-	KEY tid (template_id),
-	KEY tfn (template_filename)
-) CHARACTER SET `utf8` COLLATE `utf8_bin`;
-
-
 # Table: 'phpbb_styles_theme'
 CREATE TABLE phpbb_styles_theme (
 	theme_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	theme_name varchar(255) DEFAULT '' NOT NULL,
 	theme_copyright varchar(255) DEFAULT '' NOT NULL,
 	theme_path varchar(100) DEFAULT '' NOT NULL,
-	theme_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	theme_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	theme_data mediumtext NOT NULL,
 	PRIMARY KEY (theme_id),
 	UNIQUE theme_name (theme_name)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index be71095724..8797457e87 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1467,7 +1467,6 @@ CREATE TABLE phpbb_styles_template (
 	template_copyright varchar2(765) DEFAULT '' ,
 	template_path varchar2(100) DEFAULT '' ,
 	bbcode_bitfield varchar2(255) DEFAULT 'kNg=' NOT NULL,
-	template_storedb number(1) DEFAULT '0' NOT NULL,
 	template_inherits_id number(4) DEFAULT '0' NOT NULL,
 	template_inherit_path varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_styles_template PRIMARY KEY (template_id),
@@ -1492,23 +1491,6 @@ END;
 /
 
 
-/*
-	Table: 'phpbb_styles_template_data'
-*/
-CREATE TABLE phpbb_styles_template_data (
-	template_id number(8) DEFAULT '0' NOT NULL,
-	template_filename varchar2(100) DEFAULT '' ,
-	template_included clob DEFAULT '' ,
-	template_mtime number(11) DEFAULT '0' NOT NULL,
-	template_data clob DEFAULT '' 
-)
-/
-
-CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data (template_id)
-/
-CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data (template_filename)
-/
-
 /*
 	Table: 'phpbb_styles_theme'
 */
@@ -1517,9 +1499,6 @@ CREATE TABLE phpbb_styles_theme (
 	theme_name varchar2(765) DEFAULT '' ,
 	theme_copyright varchar2(765) DEFAULT '' ,
 	theme_path varchar2(100) DEFAULT '' ,
-	theme_storedb number(1) DEFAULT '0' NOT NULL,
-	theme_mtime number(11) DEFAULT '0' NOT NULL,
-	theme_data clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_styles_theme PRIMARY KEY (theme_id),
 	CONSTRAINT u_phpbb_theme_name UNIQUE (theme_name)
 )
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 13a00d2ebc..3c79aacd6b 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1001,7 +1001,6 @@ CREATE TABLE phpbb_styles_template (
 	template_copyright varchar(255) DEFAULT '' NOT NULL,
 	template_path varchar(100) DEFAULT '' NOT NULL,
 	bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL,
-	template_storedb INT2 DEFAULT '0' NOT NULL CHECK (template_storedb >= 0),
 	template_inherits_id INT4 DEFAULT '0' NOT NULL CHECK (template_inherits_id >= 0),
 	template_inherit_path varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (template_id)
@@ -1009,20 +1008,6 @@ CREATE TABLE phpbb_styles_template (
 
 CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (template_name);
 
-/*
-	Table: 'phpbb_styles_template_data'
-*/
-CREATE TABLE phpbb_styles_template_data (
-	template_id INT4 DEFAULT '0' NOT NULL CHECK (template_id >= 0),
-	template_filename varchar(100) DEFAULT '' NOT NULL,
-	template_included varchar(8000) DEFAULT '' NOT NULL,
-	template_mtime INT4 DEFAULT '0' NOT NULL CHECK (template_mtime >= 0),
-	template_data TEXT DEFAULT '' NOT NULL
-);
-
-CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data (template_id);
-CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data (template_filename);
-
 /*
 	Table: 'phpbb_styles_theme'
 */
@@ -1033,9 +1018,6 @@ CREATE TABLE phpbb_styles_theme (
 	theme_name varchar(255) DEFAULT '' NOT NULL,
 	theme_copyright varchar(255) DEFAULT '' NOT NULL,
 	theme_path varchar(100) DEFAULT '' NOT NULL,
-	theme_storedb INT2 DEFAULT '0' NOT NULL CHECK (theme_storedb >= 0),
-	theme_mtime INT4 DEFAULT '0' NOT NULL CHECK (theme_mtime >= 0),
-	theme_data TEXT DEFAULT '' NOT NULL,
 	PRIMARY KEY (theme_id)
 );
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index cd4e80ba13..5506922e17 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -440,7 +440,7 @@ INSERT INTO phpbb_styles (style_name, style_copyright, style_active, template_id
 INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield) VALUES ('prosilver', '&copy; phpBB Group', 'prosilver', 'lNg=');
 
 # -- phpbb_styles_theme
-INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path, theme_storedb, theme_data) VALUES ('prosilver', '&copy; phpBB Group', 'prosilver', 1, '');
+INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path) VALUES ('prosilver', '&copy; phpBB Group', 'prosilver');
 
 # -- 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, forum_parents) VALUES ('{L_FORUMS_FIRST_CATEGORY}', '', 1, 4, 0, 0, 1, 1, 1, 1, 2, 'Admin', 'AA0000', 972086460, '', '', '', '', '', '', '', 0, 0, '');
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index ce9bad13ce..e0631160fd 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -741,34 +741,18 @@ CREATE TABLE phpbb_styles_template (
 	template_copyright varchar(255) NOT NULL DEFAULT '',
 	template_path varchar(100) NOT NULL DEFAULT '',
 	bbcode_bitfield varchar(255) NOT NULL DEFAULT 'kNg=',
-	template_storedb INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	template_inherits_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	template_inherit_path varchar(255) NOT NULL DEFAULT ''
 );
 
 CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (template_name);
 
-# Table: 'phpbb_styles_template_data'
-CREATE TABLE phpbb_styles_template_data (
-	template_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	template_filename varchar(100) NOT NULL DEFAULT '',
-	template_included text(65535) NOT NULL DEFAULT '',
-	template_mtime INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	template_data mediumtext(16777215) NOT NULL DEFAULT ''
-);
-
-CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data (template_id);
-CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data (template_filename);
-
 # Table: 'phpbb_styles_theme'
 CREATE TABLE phpbb_styles_theme (
 	theme_id INTEGER PRIMARY KEY NOT NULL ,
 	theme_name varchar(255) NOT NULL DEFAULT '',
 	theme_copyright varchar(255) NOT NULL DEFAULT '',
-	theme_path varchar(100) NOT NULL DEFAULT '',
-	theme_storedb INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	theme_mtime INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	theme_data mediumtext(16777215) NOT NULL DEFAULT ''
+	theme_path varchar(100) NOT NULL DEFAULT ''
 );
 
 CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme (theme_name);
-- 
cgit v1.2.1


From cb245f5d04bcd36dd1ad8d3a95d7718ef5b15858 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Tue, 20 Sep 2011 21:04:17 +0100
Subject: [feature/remove-db-styles] Add schema changes sinces 3.0.x.

PHPBB3-9741
---
 phpBB/install/database_update.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7f542974d9..18741191d8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1062,13 +1062,22 @@ function database_update_info()
 				),
 			),
 			'drop_columns'      => array(
-			    STYLES_TABLE        => array(
+			    STYLES_TABLE		    => array(
 			        'imageset_id',
                 ),
+				STYLES_TEMPLATE_TABLE	=> array(
+					'template_storedb',
+				),
+				STYLES_THEME_TABLE		=> array(
+					'theme_storedb',
+					'theme_mtime',
+					'theme_data',
+				),
             ),
             'drop_tables'       => array(
                 STYLES_IMAGESET_TABLE,
                 STYLES_IMAGESET_DATA_TABLE,
+                STYLES_TEMPLATE_DATA_TABLE,
             ),
 		),
 	);
-- 
cgit v1.2.1


From e95aec163789cc333c39d2dd9c8432da3c428102 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Wed, 21 Sep 2011 08:34:33 +0100
Subject: [ticket/10152] Remove end '?>' from generated config.php.

PHPBB3-10152
---
 phpBB/install/install_install.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index db763f7a7c..f8c54678bf 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -903,7 +903,6 @@ class install_install extends module
 		$config_data .= "\n@define('PHPBB_INSTALLED', true);\n";
 		$config_data .= "// @define('DEBUG', true);\n";
 		$config_data .= "// @define('DEBUG_EXTRA', true);\n";
-		$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
 
 		// Attempt to write out the config file directly. If it works, this is the easiest way to do it ...
 		if ((file_exists($phpbb_root_path . 'config.' . $phpEx) && phpbb_is_writable($phpbb_root_path . 'config.' . $phpEx)) || phpbb_is_writable($phpbb_root_path))
-- 
cgit v1.2.1


From 138d1050fcfa910eb8819e91034741ed74baf4f3 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Sat, 24 Sep 2011 22:05:40 +0100
Subject: [ticket/9307] Remove hardcoded chunk size of mass emails.

The new config option is 'email_max_chunk_size' I have not added
an interface option to change this.

PHPBB3-9307
---
 phpBB/install/database_update.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a167e79308..21246a215e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1994,6 +1994,11 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.9-RC4 to 3.0.9
 		case '3.0.9-RC4':
 		break;
+
+		// Changes from 3.0.9 to 3.0.10-RC1
+		case '3.0.9':
+			set_config('email_max_chunk_size', '50');
+		break;
 	}
 }
 
-- 
cgit v1.2.1


From 81f9385477e1a6b050f447c9659faaf0bc7e871a Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Sun, 25 Sep 2011 22:13:43 +0100
Subject: [ticket/9307] Add config variable to installation schema.

PHPBB3-9307
---
 phpBB/install/schemas/schema_data.sql | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 153ac61157..84b25d676e 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -94,6 +94,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('delete_time', '0')
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_check_mx', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_function_name', 'mail');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_max_chunk_size', '50');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_package_size', '20');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1');
-- 
cgit v1.2.1


From 56c6476233646e7c735aa4e3b98c4a6b62df5c7d Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 25 Sep 2011 15:12:56 -0700
Subject: [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.

PHPBB3-10390
---
 phpBB/install/database_update.php     | 1 +
 phpBB/install/schemas/schema_data.sql | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 18741191d8..1a47e2a656 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2090,6 +2090,7 @@ function change_database_data(&$no_updates, $version)
 
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		case '3.1.0-dev':
+			set_config('load_jquery_host', 'localhost');
 			set_config('use_system_cron', 0);
 
 			$sql = 'UPDATE ' . GROUPS_TABLE . '
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5506922e17..865189f345 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -165,6 +165,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewprofi
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_track', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_host', 'localhost');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jumpbox', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_moderators', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online', '1');
-- 
cgit v1.2.1


From 2dca3c3c278e99cfd6cdbea7149063d160e4cc11 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 26 Sep 2011 20:26:32 -0700
Subject: [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP

jQuery will now be available via remote CDN from Google. Microsoft and
jQuery CDNs have been removed, so we can simplify this option for the user.
Default mode is NO so the copy of jQuery included with phpBB is served by
default.

PHPBB3-10390
---
 phpBB/install/database_update.php     | 3 ++-
 phpBB/install/schemas/schema_data.sql | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1a47e2a656..1fa01a534d 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2090,7 +2090,8 @@ function change_database_data(&$no_updates, $version)
 
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		case '3.1.0-dev':
-			set_config('load_jquery_host', 'localhost');
+			set_config('load_jquery_cdn', 0);
+			set_config('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js');
 			set_config('use_system_cron', 0);
 
 			$sql = 'UPDATE ' . GROUPS_TABLE . '
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 865189f345..843d6daaa7 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -165,7 +165,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewprofi
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_track', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_host', 'localhost');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_cdn', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jumpbox', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_moderators', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online', '1');
-- 
cgit v1.2.1


From 26e84b12e817dd5e86a82c379a03a67f9f1bacd1 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Wed, 28 Sep 2011 01:52:08 -0500
Subject: [ticket/10349] Use new schema comment function in installer

This is what now runs in the unit tests. The COMMENTS field in the dbms data
is no longer needed, so it has been removed.

PHPBB3-10349
---
 phpBB/install/install_install.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 9fe0c8aed5..9b37ee2be3 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1173,14 +1173,13 @@ class install_install extends module
 		$dbms_schema = 'schemas/' . $available_dbms[$data['dbms']]['SCHEMA'] . '_schema.sql';
 
 		// How should we treat this schema?
-		$remove_remarks = $available_dbms[$data['dbms']]['COMMENTS'];
 		$delimiter = $available_dbms[$data['dbms']]['DELIM'];
 
 		$sql_query = @file_get_contents($dbms_schema);
 
 		$sql_query = preg_replace('#phpbb_#i', $data['table_prefix'], $sql_query);
 
-		$remove_remarks($sql_query);
+		$sql_query = remove_comments($sql_query);
 
 		$sql_query = split_sql_file($sql_query, $delimiter);
 
@@ -1218,8 +1217,7 @@ class install_install extends module
 		// Change language strings...
 		$sql_query = preg_replace_callback('#\{L_([A-Z0-9\-_]*)\}#s', 'adjust_language_keys_callback', $sql_query);
 
-		// Since there is only one schema file we know the comment style and are able to remove it directly with remove_remarks
-		remove_remarks($sql_query);
+		$sql_query = remove_comments($sql_query);
 		$sql_query = split_sql_file($sql_query, ';');
 
 		foreach ($sql_query as $sql)
-- 
cgit v1.2.1


From 14f1e581faa3b66e7689c55c1e9c0485c0872b1e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 9 Jun 2011 05:13:26 +0200
Subject: [feature/extension-manager] Extension Manager & Finder

Extensions RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41499
Ticket: http://tracker.phpbb.com/browse/PHPBB3-10323

PHPBB3-10323
---
 phpBB/install/database_update.php         | 18 +++++++++++++++++-
 phpBB/install/index.php                   |  2 +-
 phpBB/install/schemas/firebird_schema.sql |  9 +++++++++
 phpBB/install/schemas/mssql_schema.sql    | 16 ++++++++++++++++
 phpBB/install/schemas/mysql_40_schema.sql |  9 +++++++++
 phpBB/install/schemas/mysql_41_schema.sql |  9 +++++++++
 phpBB/install/schemas/oracle_schema.sql   | 13 +++++++++++++
 phpBB/install/schemas/postgres_schema.sql | 11 +++++++++++
 phpBB/install/schemas/sqlite_schema.sql   |  9 +++++++++
 9 files changed, 94 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 18741191d8..b2419df3c9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -104,8 +104,12 @@ if (!defined('LOGIN_ATTEMPT_TABLE'))
 {
 	define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts');
 }
+if (!defined('EXT_TABLE'))
+{
+	define('EXT_TABLE', $table_prefix . 'ext');
+}
 
-$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx);
+$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx);
 $class_loader->register();
 
 // set up caching
@@ -1048,6 +1052,18 @@ function database_update_info()
 
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		'3.1.0-dev'		=> array(
+			'add_tables'		=> array(
+				EXT_TABLE				=> array(
+					'COLUMNS'			=> array(
+						'ext_name'		=> array('VCHAR', ''),
+						'ext_active'	=> array('BOOL', 0),
+					),
+					'KEYS'				=> array(
+						'ext_name'		=> array('UNIQUE', 'ext_name'),
+						'ext_active'	=> array('INDEX', 'ext_active'),
+					),
+				),
+			),
 			'add_columns'		=> array(
 				GROUPS_TABLE		=> array(
 					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index a4ff93e701..fbe8ae63a7 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -82,7 +82,7 @@ include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
 
-$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx);
+$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx);
 $class_loader->register();
 
 // set up caching
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 67e5547bb6..5f5aaaaa45 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -281,6 +281,15 @@ BEGIN
 END;;
 
 
+# Table: 'phpbb_ext'
+CREATE TABLE phpbb_ext (
+	ext_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	ext_active INTEGER DEFAULT 0 NOT NULL
+);;
+
+CREATE UNIQUE INDEX phpbb_ext_ext_name ON phpbb_ext(ext_name);;
+CREATE INDEX phpbb_ext_ext_active ON phpbb_ext(ext_active);;
+
 # Table: 'phpbb_extensions'
 CREATE TABLE phpbb_extensions (
 	extension_id INTEGER NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index fe69670ded..052531993f 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -358,6 +358,22 @@ CREATE  INDEX [save_time] ON [phpbb_drafts]([save_time]) ON [PRIMARY]
 GO
 
 
+/*
+	Table: 'phpbb_ext'
+*/
+CREATE TABLE [phpbb_ext] (
+	[ext_name] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[ext_active] [int] DEFAULT (0) NOT NULL 
+) ON [PRIMARY]
+GO
+
+CREATE  UNIQUE  INDEX [ext_name] ON [phpbb_ext]([ext_name]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [ext_active] ON [phpbb_ext]([ext_active]) ON [PRIMARY]
+GO
+
+
 /*
 	Table: 'phpbb_extensions'
 */
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index da6ce35be3..03402d7ed1 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -191,6 +191,15 @@ CREATE TABLE phpbb_drafts (
 );
 
 
+# Table: 'phpbb_ext'
+CREATE TABLE phpbb_ext (
+	ext_name varbinary(255) DEFAULT '' NOT NULL,
+	ext_active tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	UNIQUE ext_name (ext_name),
+	KEY ext_active (ext_active)
+);
+
+
 # Table: 'phpbb_extensions'
 CREATE TABLE phpbb_extensions (
 	extension_id mediumint(8) UNSIGNED NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index cdbe377178..8876b52a30 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -191,6 +191,15 @@ CREATE TABLE phpbb_drafts (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
+# Table: 'phpbb_ext'
+CREATE TABLE phpbb_ext (
+	ext_name varchar(255) DEFAULT '' NOT NULL,
+	ext_active tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	UNIQUE ext_name (ext_name),
+	KEY ext_active (ext_active)
+) CHARACTER SET `utf8` COLLATE `utf8_bin`;
+
+
 # Table: 'phpbb_extensions'
 CREATE TABLE phpbb_extensions (
 	extension_id mediumint(8) UNSIGNED NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8797457e87..df31f6d3d6 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -407,6 +407,19 @@ END;
 /
 
 
+/*
+	Table: 'phpbb_ext'
+*/
+CREATE TABLE phpbb_ext (
+	ext_name varchar2(255) DEFAULT '' ,
+	ext_active number(1) DEFAULT '0' NOT NULL,
+	CONSTRAINT u_phpbb_ext_name UNIQUE (ext_name)
+)
+/
+
+CREATE INDEX phpbb_ext_ext_active ON phpbb_ext (ext_active)
+/
+
 /*
 	Table: 'phpbb_extensions'
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 3c79aacd6b..dbe891a3ac 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -312,6 +312,17 @@ CREATE TABLE phpbb_drafts (
 
 CREATE INDEX phpbb_drafts_save_time ON phpbb_drafts (save_time);
 
+/*
+	Table: 'phpbb_ext'
+*/
+CREATE TABLE phpbb_ext (
+	ext_name varchar(255) DEFAULT '' NOT NULL,
+	ext_active INT2 DEFAULT '0' NOT NULL CHECK (ext_active >= 0)
+);
+
+CREATE UNIQUE INDEX phpbb_ext_ext_name ON phpbb_ext (ext_name);
+CREATE INDEX phpbb_ext_ext_active ON phpbb_ext (ext_active);
+
 /*
 	Table: 'phpbb_extensions'
 */
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index e0631160fd..3c1d476daa 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -186,6 +186,15 @@ CREATE TABLE phpbb_drafts (
 
 CREATE INDEX phpbb_drafts_save_time ON phpbb_drafts (save_time);
 
+# Table: 'phpbb_ext'
+CREATE TABLE phpbb_ext (
+	ext_name varchar(255) NOT NULL DEFAULT '',
+	ext_active INTEGER UNSIGNED NOT NULL DEFAULT '0'
+);
+
+CREATE UNIQUE INDEX phpbb_ext_ext_name ON phpbb_ext (ext_name);
+CREATE INDEX phpbb_ext_ext_active ON phpbb_ext (ext_active);
+
 # Table: 'phpbb_extensions'
 CREATE TABLE phpbb_extensions (
 	extension_id INTEGER PRIMARY KEY NOT NULL ,
-- 
cgit v1.2.1


From dcc5ca53778184f0719b9ac0c221688ad03bd57e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 15 Aug 2011 20:00:47 -0400
Subject: [feature/extension-manager] Make search backends loadable from
 extensions

Search backends are now required to be autoloadable. The database updater to
3.1 tries to guess the class name as phpbb_search_<oldname> which works for
the default backends we ship.

PHPBB3-10323
---
 phpBB/install/database_update.php     | 4 ++++
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b2419df3c9..1f3c01ee3e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2106,6 +2106,10 @@ function change_database_data(&$no_updates, $version)
 
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		case '3.1.0-dev':
+			// try to guess the new auto loaded search class name
+			// works for native and mysql fulltext
+			set_config('search_type', 'phpbb_search_' . $config['search_type']);
+
 			set_config('use_system_cron', 0);
 
 			$sql = 'UPDATE ' . GROUPS_TABLE . '
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5506922e17..bd7334f9d4 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -223,7 +223,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_block_size'
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_anonymous_interval', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', 'fulltext_native');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', 'phpbb_search_fulltext_native');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_store_results', '1800');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_empty_referer', '1');
-- 
cgit v1.2.1


From 96209e022477d97b581b79cabace4caddd19501b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 15 Aug 2011 21:38:47 -0400
Subject: [feature/extension-manager] The class loader no longer knows about
 extensions

Instead the class loader is instantiated twice. Once with the phpbb_ prefix
and once with the phpbb_ext_ prefix.

PHPBB3-10323
---
 phpBB/install/database_update.php | 9 ++++++---
 phpBB/install/index.php           | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1f3c01ee3e..64dea37ef8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -109,13 +109,16 @@ if (!defined('EXT_TABLE'))
 	define('EXT_TABLE', $table_prefix . 'ext');
 }
 
-$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx);
-$class_loader->register();
+$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
+$phpbb_class_loader_ext->register();
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
+$phpbb_class_loader->register();
 
 // set up caching
 $cache_factory = new phpbb_cache_factory($acm_type);
 $cache = $cache_factory->get_service();
-$class_loader->set_cache($cache->get_driver());
+$phpbb_class_loader_ext->set_cache($cache->get_driver());
+$phpbb_class_loader->set_cache($cache->get_driver());
 
 $request = new phpbb_request();
 $user = new user();
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index fbe8ae63a7..0a46a06664 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -82,13 +82,16 @@ include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
 
-$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx);
-$class_loader->register();
+$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
+$phpbb_class_loader_ext->register();
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
+$phpbb_class_loader->register();
 
 // set up caching
 $cache_factory = new phpbb_cache_factory('file');
 $cache = $cache_factory->get_service();
-$class_loader->set_cache($cache->get_driver());
+$phpbb_class_loader_ext->set_cache($cache->get_driver());
+$phpbb_class_loader->set_cache($cache->get_driver());
 
 $request = new phpbb_request();
 
-- 
cgit v1.2.1


From 60ad0e21b5d4f940740650df69b7134a573f2a97 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 21 Aug 2011 03:06:56 -0400
Subject: [feature/extension-manager] Remove the ext_active index for lack of
 specificity

PHPBB3-10323
---
 phpBB/install/database_update.php         | 1 -
 phpBB/install/schemas/firebird_schema.sql | 1 -
 phpBB/install/schemas/mssql_schema.sql    | 3 ---
 phpBB/install/schemas/mysql_40_schema.sql | 3 +--
 phpBB/install/schemas/mysql_41_schema.sql | 3 +--
 phpBB/install/schemas/oracle_schema.sql   | 2 --
 phpBB/install/schemas/postgres_schema.sql | 1 -
 phpBB/install/schemas/sqlite_schema.sql   | 1 -
 8 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 64dea37ef8..45de19c918 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1063,7 +1063,6 @@ function database_update_info()
 					),
 					'KEYS'				=> array(
 						'ext_name'		=> array('UNIQUE', 'ext_name'),
-						'ext_active'	=> array('INDEX', 'ext_active'),
 					),
 				),
 			),
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 5f5aaaaa45..4952b6bbdf 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -288,7 +288,6 @@ CREATE TABLE phpbb_ext (
 );;
 
 CREATE UNIQUE INDEX phpbb_ext_ext_name ON phpbb_ext(ext_name);;
-CREATE INDEX phpbb_ext_ext_active ON phpbb_ext(ext_active);;
 
 # Table: 'phpbb_extensions'
 CREATE TABLE phpbb_extensions (
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 052531993f..76f3fc6491 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -370,9 +370,6 @@ GO
 CREATE  UNIQUE  INDEX [ext_name] ON [phpbb_ext]([ext_name]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [ext_active] ON [phpbb_ext]([ext_active]) ON [PRIMARY]
-GO
-
 
 /*
 	Table: 'phpbb_extensions'
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 03402d7ed1..a1b282418d 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -195,8 +195,7 @@ CREATE TABLE phpbb_drafts (
 CREATE TABLE phpbb_ext (
 	ext_name varbinary(255) DEFAULT '' NOT NULL,
 	ext_active tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	UNIQUE ext_name (ext_name),
-	KEY ext_active (ext_active)
+	UNIQUE ext_name (ext_name)
 );
 
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 8876b52a30..2f2de17dcb 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -195,8 +195,7 @@ CREATE TABLE phpbb_drafts (
 CREATE TABLE phpbb_ext (
 	ext_name varchar(255) DEFAULT '' NOT NULL,
 	ext_active tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	UNIQUE ext_name (ext_name),
-	KEY ext_active (ext_active)
+	UNIQUE ext_name (ext_name)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index df31f6d3d6..f0a958d2f6 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -417,8 +417,6 @@ CREATE TABLE phpbb_ext (
 )
 /
 
-CREATE INDEX phpbb_ext_ext_active ON phpbb_ext (ext_active)
-/
 
 /*
 	Table: 'phpbb_extensions'
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index dbe891a3ac..956167ff39 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -321,7 +321,6 @@ CREATE TABLE phpbb_ext (
 );
 
 CREATE UNIQUE INDEX phpbb_ext_ext_name ON phpbb_ext (ext_name);
-CREATE INDEX phpbb_ext_ext_active ON phpbb_ext (ext_active);
 
 /*
 	Table: 'phpbb_extensions'
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 3c1d476daa..223dbc3c02 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -193,7 +193,6 @@ CREATE TABLE phpbb_ext (
 );
 
 CREATE UNIQUE INDEX phpbb_ext_ext_name ON phpbb_ext (ext_name);
-CREATE INDEX phpbb_ext_ext_active ON phpbb_ext (ext_active);
 
 # Table: 'phpbb_extensions'
 CREATE TABLE phpbb_extensions (
-- 
cgit v1.2.1


From c7a986eccdac183cc81b3da486092f4ab82109ba Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 29 Aug 2011 17:17:40 -0400
Subject: [feature/extension-manager] Use an incremental process for enable and
 purge

The enable or purge operation of an extension could take a long time if an
expensive operation needs to be executed on a large set of data. To allow
this to succeed from a web interface with max_execution_time set in the
webserver's php configuration, subsequent requests must continue the
operation started earlier. So individual enable and purge implementations
must be able to spread their work across multiple steps.

PHPBB3-10323
---
 phpBB/install/database_update.php         | 1 +
 phpBB/install/schemas/firebird_schema.sql | 3 ++-
 phpBB/install/schemas/mssql_schema.sql    | 3 ++-
 phpBB/install/schemas/mysql_40_schema.sql | 1 +
 phpBB/install/schemas/mysql_41_schema.sql | 1 +
 phpBB/install/schemas/oracle_schema.sql   | 1 +
 phpBB/install/schemas/postgres_schema.sql | 3 ++-
 phpBB/install/schemas/sqlite_schema.sql   | 3 ++-
 8 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 45de19c918..9a7231040b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1060,6 +1060,7 @@ function database_update_info()
 					'COLUMNS'			=> array(
 						'ext_name'		=> array('VCHAR', ''),
 						'ext_active'	=> array('BOOL', 0),
+						'ext_state'		=> array('TEXT', ''),
 					),
 					'KEYS'				=> array(
 						'ext_name'		=> array('UNIQUE', 'ext_name'),
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 4952b6bbdf..9bebf11c4b 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -284,7 +284,8 @@ END;;
 # Table: 'phpbb_ext'
 CREATE TABLE phpbb_ext (
 	ext_name VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	ext_active INTEGER DEFAULT 0 NOT NULL
+	ext_active INTEGER DEFAULT 0 NOT NULL,
+	ext_state BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL
 );;
 
 CREATE UNIQUE INDEX phpbb_ext_ext_name ON phpbb_ext(ext_name);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 76f3fc6491..bf137b89f4 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -363,7 +363,8 @@ GO
 */
 CREATE TABLE [phpbb_ext] (
 	[ext_name] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[ext_active] [int] DEFAULT (0) NOT NULL 
+	[ext_active] [int] DEFAULT (0) NOT NULL ,
+	[ext_state] [varchar] (8000) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index a1b282418d..54504beb1c 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -195,6 +195,7 @@ CREATE TABLE phpbb_drafts (
 CREATE TABLE phpbb_ext (
 	ext_name varbinary(255) DEFAULT '' NOT NULL,
 	ext_active tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	ext_state blob NOT NULL,
 	UNIQUE ext_name (ext_name)
 );
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 2f2de17dcb..139833b7b9 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -195,6 +195,7 @@ CREATE TABLE phpbb_drafts (
 CREATE TABLE phpbb_ext (
 	ext_name varchar(255) DEFAULT '' NOT NULL,
 	ext_active tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	ext_state text NOT NULL,
 	UNIQUE ext_name (ext_name)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index f0a958d2f6..2f958b835b 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -413,6 +413,7 @@ END;
 CREATE TABLE phpbb_ext (
 	ext_name varchar2(255) DEFAULT '' ,
 	ext_active number(1) DEFAULT '0' NOT NULL,
+	ext_state clob DEFAULT '' ,
 	CONSTRAINT u_phpbb_ext_name UNIQUE (ext_name)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 956167ff39..86ee044913 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -317,7 +317,8 @@ CREATE INDEX phpbb_drafts_save_time ON phpbb_drafts (save_time);
 */
 CREATE TABLE phpbb_ext (
 	ext_name varchar(255) DEFAULT '' NOT NULL,
-	ext_active INT2 DEFAULT '0' NOT NULL CHECK (ext_active >= 0)
+	ext_active INT2 DEFAULT '0' NOT NULL CHECK (ext_active >= 0),
+	ext_state varchar(8000) DEFAULT '' NOT NULL
 );
 
 CREATE UNIQUE INDEX phpbb_ext_ext_name ON phpbb_ext (ext_name);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 223dbc3c02..94e192fc0c 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -189,7 +189,8 @@ CREATE INDEX phpbb_drafts_save_time ON phpbb_drafts (save_time);
 # Table: 'phpbb_ext'
 CREATE TABLE phpbb_ext (
 	ext_name varchar(255) NOT NULL DEFAULT '',
-	ext_active INTEGER UNSIGNED NOT NULL DEFAULT '0'
+	ext_active INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	ext_state text(65535) NOT NULL DEFAULT ''
 );
 
 CREATE UNIQUE INDEX phpbb_ext_ext_name ON phpbb_ext (ext_name);
-- 
cgit v1.2.1


From 48391d2dde8f40e3c7e7d4a41b8ff1c32508ffc1 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 29 Aug 2011 20:05:46 -0400
Subject: [feature/extension-manager] Create an extension manager on update and
 install

It's required when adding modules

PHPBB3-10323
---
 phpBB/install/database_update.php | 8 +++++++-
 phpBB/install/install_install.php | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9a7231040b..2635396af0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -678,7 +678,13 @@ function _write_result($no_updates, $errored, $error_ary)
 
 function _add_modules($modules_to_install)
 {
-	global $phpbb_root_path, $phpEx, $db;
+	global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager;
+
+	// modules require an extension manager
+	if (empty($phpbb_extension_manager))
+	{
+		$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx");
+	}
 
 	include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
 
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index f8c54678bf..c6b315ae6c 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1483,7 +1483,13 @@ class install_install extends module
 	*/
 	function add_modules($mode, $sub)
 	{
-		global $db, $lang, $phpbb_root_path, $phpEx;
+		global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager;
+
+		// modules require an extension manager
+		if (empty($phpbb_extension_manager))
+		{
+			$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx");
+		}
 
 		include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
 
-- 
cgit v1.2.1


From 018a8359974273b65a3e6bd8aeca75396fd36a5b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 29 Aug 2011 20:06:17 -0400
Subject: [feature/extension-manager] The default fulltext native backend was
 renamed

This was done to make it autoloadable.

PHPBB3-10323
---
 phpBB/install/install_install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index c6b315ae6c..5ea3525edd 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1465,7 +1465,7 @@ class install_install extends module
 		set_config_count(null, null, null, $config);
 
 		$error = false;
-		$search = new fulltext_native($error);
+		$search = new phpbb_search_fulltext_native($error);
 
 		$sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
 			FROM ' . POSTS_TABLE;
-- 
cgit v1.2.1


From fe4b8818ec1f448d5625534e5027cfbc1177ab9a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 29 Aug 2011 20:54:42 -0400
Subject: [feature/extension-manager] Always store the full class name as
 module basename

The updater swaps out all basenames.

PHPBB3-10323
---
 phpBB/install/database_update.php | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2635396af0..221f6b1344 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2115,6 +2115,37 @@ function change_database_data(&$no_updates, $version)
 
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		case '3.1.0-dev':
+
+			// rename all module basenames to full classname
+			$sql = 'SELECT module_id, module_basename, module_class
+				FROM ' . MODULES_TABLE;
+			$result = $db->sql_query($sql);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$module_id = (int) $row['module_id'];
+				unset($row['module_id']);
+
+				if (!empty($row['module_basename']) && !empty($row['module_class']))
+				{
+					// all the class names start with class name or with phpbb_ for auto loading
+					if (strpos($row['module_basename'], $row['module_class'] . '_') !== 0 &&
+						strpos($row['module_basename'], 'phpbb_') !== 0)
+					{
+						$row['module_basename'] = $row['module_class'] . '_' . $row['module_basename'];
+
+						$sql_update = $db->sql_build_array('UPDATE', $row);
+
+						$sql = 'UPDATE ' . MODULES_TABLE . '
+							SET ' . $sql_update . '
+							WHERE module_id = ' . $module_id;
+						_sql($sql, $errored, $error_ary);
+					}
+				}
+			}
+
+			$db->sql_freeresult($result);
+
 			// try to guess the new auto loaded search class name
 			// works for native and mysql fulltext
 			set_config('search_type', 'phpbb_search_' . $config['search_type']);
@@ -2159,14 +2190,14 @@ function change_database_data(&$no_updates, $version)
 			// Install modules
 			$modules_to_install = array(
 				'position'	=> array(
-					'base'		=> 'groups',
+					'base'		=> 'acp_groups',
 					'class'		=> 'acp',
 					'title'		=> 'ACP_GROUPS_POSITION',
 					'auth'		=> 'acl_a_group',
 					'cat'		=> 'ACP_GROUPS',
 				),
 				'manage'	=> array(
-					'base'		=> 'attachments',
+					'base'		=> 'acp_attachments',
 					'class'		=> 'acp',
 					'title'		=> 'ACP_MANAGE_ATTACHMENTS',
 					'auth'		=> 'acl_a_attach',
-- 
cgit v1.2.1


From ea46feb11542a9cf54ce083ee0ad03f4c5e02a1e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 30 Aug 2011 01:32:11 -0400
Subject: [feature/extension-manager] Add support for templates in extensions.

This commit adds a template path provider to separate the process of locating
(cached) paths in extensions from the template engine. The locator is supplied
with a list of paths from the path provider.

Admin templates can now be created in ext/<ext>/adm/style/ and regular
templates go into ext/<ext>/styles/<style>/template/. Extension templates
override regular templates. So if an extension supplies a file with a name
used in phpBB, the extension's file will be used.

A side-effect of this commit: Locator and Provider are now able to deal with
arbitrary levels of template inheritance. So we can expose this through
phpbb_template if we choose to, and allow styles to inherit from inherited
styles.

PHPBB3-10323
---
 phpBB/install/index.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 0a46a06664..93effc27f1 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -202,8 +202,10 @@ $config = new phpbb_config(array(
 	'load_tplcompile'	=> '1'
 ));
 
-$template_locator = new phpbb_template_locator();
-$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $template_locator);
+$phpbb_template_locator = new phpbb_template_locator();
+$phpbb_template_path_provider = new phpbb_template_path_provider($phpbb_extension_manager);
+$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_template_locator, $phpbb_template_path_provider);
+$template->set_ext_dir_prefix('adm/');
 $template->set_custom_template('../adm/style', 'admin');
 $template->assign_var('T_ASSETS_PATH', '../assets');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
-- 
cgit v1.2.1


From 482a8c47ea77dcaaa3c0c23c9a141aea583cf24f Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 30 Aug 2011 19:15:38 -0400
Subject: [feature/extension-manager] Don't use the extension manager during
 install

Template needs to be able to work without extensions.

PHPBB3-10323
---
 phpBB/install/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 93effc27f1..abe5d1e485 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -203,7 +203,7 @@ $config = new phpbb_config(array(
 ));
 
 $phpbb_template_locator = new phpbb_template_locator();
-$phpbb_template_path_provider = new phpbb_template_path_provider($phpbb_extension_manager);
+$phpbb_template_path_provider = new phpbb_template_path_provider();
 $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_template_locator, $phpbb_template_path_provider);
 $template->set_ext_dir_prefix('adm/');
 $template->set_custom_template('../adm/style', 'admin');
-- 
cgit v1.2.1


From 1df2148bf4d12405018fcbe93cdbff7b9bf4174e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 13 Oct 2011 23:29:52 +0200
Subject: [ticket/10409] Running database_update.php multiple times breaks the
 update

PHPBB3-10409
---
 phpBB/install/database_update.php | 85 ++++++++++++++++++++++++++-------------
 1 file changed, 57 insertions(+), 28 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 18741191d8..4507e5c371 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2090,42 +2090,68 @@ function change_database_data(&$no_updates, $version)
 
 		// Changes from 3.1.0-dev to 3.1.0-A1
 		case '3.1.0-dev':
-			set_config('use_system_cron', 0);
-
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_teampage = 1
-				WHERE group_type = ' . GROUP_SPECIAL . "
-					AND group_name = 'ADMINISTRATORS'";
-			_sql($sql, $errored, $error_ary);
-
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_teampage = 2
-				WHERE group_type = ' . GROUP_SPECIAL . "
-					AND group_name = 'GLOBAL_MODERATORS'";
-			_sql($sql, $errored, $error_ary);
-
-			set_config('legend_sort_groupname', '0');
-			set_config('teampage_multiple', '1');
-			set_config('teampage_forums', '1');
+			if (!isset($config['use_system_cron']))
+			{
+				set_config('use_system_cron', 0);
+			}
 
-			$sql = 'SELECT group_id
+			$sql = 'SELECT group_teampage
 				FROM ' . GROUPS_TABLE . '
-				WHERE group_legend = 1
-				ORDER BY group_name ASC';
-			$result = $db->sql_query($sql);
+				WHERE group_teampage > 0';
+			$result = $db->sql_query_limit($sql, 1);
+			$added_groups_teampage = (bool) $db->sql_fetchfield('group_teampage');
+			$db->sql_freeresult($result);
 
-			$next_legend = 1;
-			while ($row = $db->sql_fetchrow($result))
+			if (!$added_groups_teampage)
 			{
 				$sql = 'UPDATE ' . GROUPS_TABLE . '
-					SET group_legend = ' . $next_legend . '
-					WHERE group_id = ' . (int) $row['group_id'];
+					SET group_teampage = 1
+					WHERE group_type = ' . GROUP_SPECIAL . "
+						AND group_name = 'ADMINISTRATORS'";
+				_sql($sql, $errored, $error_ary);
+
+				$sql = 'UPDATE ' . GROUPS_TABLE . '
+					SET group_teampage = 2
+					WHERE group_type = ' . GROUP_SPECIAL . "
+						AND group_name = 'GLOBAL_MODERATORS'";
 				_sql($sql, $errored, $error_ary);
+			}
 
-				$next_legend++;
+			if (!isset($config['use_system_cron']))
+			{
+				set_config('legend_sort_groupname', '0');
+				set_config('teampage_multiple', '1');
+				set_config('teampage_forums', '1');
 			}
+
+			$sql = 'SELECT group_legend
+				FROM ' . GROUPS_TABLE . '
+				WHERE group_teampage > 1';
+			$result = $db->sql_query_limit($sql, 1);
+			$updated_group_legend = (bool) $db->sql_fetchfield('group_teampage');
 			$db->sql_freeresult($result);
-			unset($next_legend);
+
+			if (!$updated_group_legend)
+			{
+				$sql = 'SELECT group_id
+					FROM ' . GROUPS_TABLE . '
+					WHERE group_legend = 1
+					ORDER BY group_name ASC';
+				$result = $db->sql_query($sql);
+
+				$next_legend = 1;
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$sql = 'UPDATE ' . GROUPS_TABLE . '
+						SET group_legend = ' . $next_legend . '
+						WHERE group_id = ' . (int) $row['group_id'];
+					_sql($sql, $errored, $error_ary);
+
+					$next_legend++;
+				}
+				$db->sql_freeresult($result);
+				unset($next_legend);
+			}
 
 			// Install modules
 			$modules_to_install = array(
@@ -2229,7 +2255,10 @@ function change_database_data(&$no_updates, $version)
 			}
 
 			// Allow custom profile fields in pm templates
-			set_config('load_cpf_pm', '0');
+			if (!isset($config['load_cpf_pm']))
+			{
+				set_config('load_cpf_pm', '0');
+			}
 
 			$no_updates = false;
 		break;
-- 
cgit v1.2.1


From 7f42970ba005ca27f85e4375267bd32b8ad35341 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 02:00:46 +0200
Subject: [feature/remove-imagesets] Fix create_schema_files, get rid of
 imagesets

PHPBB3-10336
---
 phpBB/install/schemas/mssql_schema.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index fe69670ded..b78a1b7fdc 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1307,7 +1307,7 @@ CREATE TABLE [phpbb_styles] (
 	[style_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[style_active] [int] DEFAULT (1) NOT NULL ,
 	[template_id] [int] DEFAULT (0) NOT NULL ,
-	[theme_id] [int] DEFAULT (0) NOT NULL
+	[theme_id] [int] DEFAULT (0) NOT NULL 
 ) ON [PRIMARY]
 GO
 
-- 
cgit v1.2.1


From 8cf22f552935417911306cb2830d7522791c9098 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 03:41:02 +0200
Subject: [ticket/10189] Add "automatically generated" comment into
 schema-files

PHPBB3-10189
---
 phpBB/install/schemas/firebird_schema.sql | 5 +++++
 phpBB/install/schemas/mssql_schema.sql    | 8 ++++++++
 phpBB/install/schemas/mysql_40_schema.sql | 5 +++++
 phpBB/install/schemas/mysql_41_schema.sql | 5 +++++
 phpBB/install/schemas/oracle_schema.sql   | 8 ++++++++
 phpBB/install/schemas/postgres_schema.sql | 8 ++++++++
 phpBB/install/schemas/sqlite_schema.sql   | 5 +++++
 7 files changed, 44 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 40041b13cb..852c62705e 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1,3 +1,8 @@
+# DO NOT EDIT THIS FILE, IT IS GENERATED
+#
+# To change the contents of this file, edit
+# phpBB/develop/create_schema_files.php and
+# run it.
 #
 # $Id: $
 #
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index c4fc2d4eec..bcdb0dc236 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1,3 +1,11 @@
+/*
+ * DO NOT EDIT THIS FILE, IT IS GENERATED
+ *
+ * To change the contents of this file, edit
+ * phpBB/develop/create_schema_files.php and
+ * run it.
+ */
+
 /*
 
  $Id: $
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 06d32166f3..f0357afc23 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -1,3 +1,8 @@
+# DO NOT EDIT THIS FILE, IT IS GENERATED
+#
+# To change the contents of this file, edit
+# phpBB/develop/create_schema_files.php and
+# run it.
 #
 # $Id: $
 #
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 1db2790ec7..97fe33dbdd 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -1,3 +1,8 @@
+# DO NOT EDIT THIS FILE, IT IS GENERATED
+#
+# To change the contents of this file, edit
+# phpBB/develop/create_schema_files.php and
+# run it.
 #
 # $Id: $
 #
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 783261e365..d879da4048 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1,3 +1,11 @@
+/*
+ * DO NOT EDIT THIS FILE, IT IS GENERATED
+ *
+ * To change the contents of this file, edit
+ * phpBB/develop/create_schema_files.php and
+ * run it.
+ */
+
 /*
 
  $Id: $
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index cf655cb1c7..f532492c2c 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1,3 +1,11 @@
+/*
+ * DO NOT EDIT THIS FILE, IT IS GENERATED
+ *
+ * To change the contents of this file, edit
+ * phpBB/develop/create_schema_files.php and
+ * run it.
+ */
+
 /*
 
  $Id: $
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index dae1eb839c..5557e0a0b2 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -1,3 +1,8 @@
+# DO NOT EDIT THIS FILE, IT IS GENERATED
+#
+# To change the contents of this file, edit
+# phpBB/develop/create_schema_files.php and
+# run it.
 #
 # $Id: $
 #
-- 
cgit v1.2.1


From c3f3435228accc44e2fd8d358c21b81f8ec66d87 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 04:29:28 +0200
Subject: [ticket/10189] Get rid of $id$ from schema files

PHPBB3-10189
---
 phpBB/install/schemas/firebird_schema.sql | 4 ----
 phpBB/install/schemas/mssql_schema.sql    | 6 ------
 phpBB/install/schemas/mysql_40_schema.sql | 4 ----
 phpBB/install/schemas/mysql_41_schema.sql | 4 ----
 phpBB/install/schemas/oracle_schema.sql   | 6 ------
 phpBB/install/schemas/postgres_schema.sql | 6 ------
 phpBB/install/schemas/sqlite_schema.sql   | 4 ----
 7 files changed, 34 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 852c62705e..73052f0a22 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -3,10 +3,6 @@
 # To change the contents of this file, edit
 # phpBB/develop/create_schema_files.php and
 # run it.
-#
-# $Id: $
-#
-
 
 # Table: 'phpbb_attachments'
 CREATE TABLE phpbb_attachments (
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index bcdb0dc236..8ed3ba7e12 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -6,12 +6,6 @@
  * run it.
  */
 
-/*
-
- $Id: $
-
-*/
-
 /*
 	Table: 'phpbb_attachments'
 */
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index f0357afc23..42b7291d9d 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -3,10 +3,6 @@
 # To change the contents of this file, edit
 # phpBB/develop/create_schema_files.php and
 # run it.
-#
-# $Id: $
-#
-
 # Table: 'phpbb_attachments'
 CREATE TABLE phpbb_attachments (
 	attach_id mediumint(8) UNSIGNED NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 97fe33dbdd..7a6d0ae188 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -3,10 +3,6 @@
 # To change the contents of this file, edit
 # phpBB/develop/create_schema_files.php and
 # run it.
-#
-# $Id: $
-#
-
 # Table: 'phpbb_attachments'
 CREATE TABLE phpbb_attachments (
 	attach_id mediumint(8) UNSIGNED NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index d879da4048..6e7ec31efc 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -6,12 +6,6 @@
  * run it.
  */
 
-/*
-
- $Id: $
-
-*/
-
 /*
   This first section is optional, however its probably the best method
   of running phpBB on Oracle. If you already have a tablespace and user created
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index f532492c2c..38f167bc7b 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -6,12 +6,6 @@
  * run it.
  */
 
-/*
-
- $Id: $
-
-*/
-
 BEGIN;
 
 /*
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 5557e0a0b2..c0574244ca 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -3,10 +3,6 @@
 # To change the contents of this file, edit
 # phpBB/develop/create_schema_files.php and
 # run it.
-#
-# $Id: $
-#
-
 BEGIN TRANSACTION;
 
 # Table: 'phpbb_attachments'
-- 
cgit v1.2.1


From a3928bf82d7fd6a1da074716c08c547afc961346 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 14 Oct 2011 17:10:21 +0200
Subject: [feature/functional-tests] Generate config correctly and install only
 once

PHPBB3-10414
---
 phpBB/install/install_install.php | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index f8c54678bf..439bebf27e 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -876,33 +876,8 @@ class install_install extends module
 
 		@chmod($phpbb_root_path . 'cache/install_lock', 0777);
 
-		$load_extensions = implode(',', $load_extensions);
-
 		// Time to convert the data provided into a config file
-		$config_data = "<?php\n";
-		$config_data .= "// phpBB 3.0.x auto-generated configuration file\n// Do not change anything in this file!\n";
-
-		$config_data_array = array(
-			'dbms'			=> $available_dbms[$data['dbms']]['DRIVER'],
-			'dbhost'		=> $data['dbhost'],
-			'dbport'		=> $data['dbport'],
-			'dbname'		=> $data['dbname'],
-			'dbuser'		=> $data['dbuser'],
-			'dbpasswd'		=> htmlspecialchars_decode($data['dbpasswd']),
-			'table_prefix'	=> $data['table_prefix'],
-			'acm_type'		=> 'file',
-			'load_extensions'	=> $load_extensions,
-		);
-
-		foreach ($config_data_array as $key => $value)
-		{
-			$config_data .= "\${$key} = '" . str_replace("'", "\\'", str_replace('\\', '\\\\', $value)) . "';\n";
-		}
-		unset($config_data_array);
-
-		$config_data .= "\n@define('PHPBB_INSTALLED', true);\n";
-		$config_data .= "// @define('DEBUG', true);\n";
-		$config_data .= "// @define('DEBUG_EXTRA', true);\n";
+		$config_data = phpbb_create_config_file_data($data, $available_dbms[$data['dbms']]['DRIVER'], $load_extensions);
 
 		// Attempt to write out the config file directly. If it works, this is the easiest way to do it ...
 		if ((file_exists($phpbb_root_path . 'config.' . $phpEx) && phpbb_is_writable($phpbb_root_path . 'config.' . $phpEx)) || phpbb_is_writable($phpbb_root_path))
-- 
cgit v1.2.1


From 65a34fd047f4ac1ff3638a568f44d3fe7d664d88 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 14 Oct 2011 00:54:11 +0200
Subject: [ticket/10410] Add option to display users in their first teampage
 group

PHPBB3-10410
---
 phpBB/install/database_update.php     | 8 ++++++--
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4507e5c371..8450cc4ab7 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2117,10 +2117,9 @@ function change_database_data(&$no_updates, $version)
 				_sql($sql, $errored, $error_ary);
 			}
 
-			if (!isset($config['use_system_cron']))
+			if (!isset($config['legend_sort_groupname']))
 			{
 				set_config('legend_sort_groupname', '0');
-				set_config('teampage_multiple', '1');
 				set_config('teampage_forums', '1');
 			}
 
@@ -2260,6 +2259,11 @@ function change_database_data(&$no_updates, $version)
 				set_config('load_cpf_pm', '0');
 			}
 
+			if (!isset($config['teampage_memberships']))
+			{
+				set_config('teampage_memberships', '1');
+			}
+
 			$no_updates = false;
 		break;
 	}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5506922e17..4361ca45c3 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -243,7 +243,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port', '25');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('teampage_multiple', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('teampage_memberships', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('teampage_forums', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', '25');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
-- 
cgit v1.2.1


From 6370ef27057643ee7fe0a6fbf2341c2ebdb57d4c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 17 Oct 2011 23:22:36 +0200
Subject: [ticket/9066] Disallow some database prefix to prevent same errors
 and problems

With this patch database prefixes must not be empty and only contain
alphanumeric characters, numbers and underscores.

PHPBB3-9066
---
 phpBB/install/install_install.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 9fe0c8aed5..bb1d858cfc 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -546,6 +546,11 @@ class install_install extends module
 				$error[] = $lang['INST_ERR_NO_DB'];
 				$connect_test = false;
 			}
+			else if (!preg_match('#^[a-zA-Z][a-zA-Z0-9_]*$#', $data['table_prefix'], $result))
+			{
+				$error[] = $lang['INST_ERR_DB_INVALID_PREFIX'];
+				$connect_test = false;
+			}
 			else
 			{
 				$connect_test = connect_check_db(true, $error, $available_dbms[$data['dbms']], $data['table_prefix'], $data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport']);
@@ -2032,7 +2037,7 @@ class install_install extends module
 		'dbname'				=> array('lang' => 'DB_NAME',		'type' => 'text:25:100', 'explain' => false),
 		'dbuser'				=> array('lang' => 'DB_USERNAME',	'type' => 'text:25:100', 'explain' => false),
 		'dbpasswd'				=> array('lang' => 'DB_PASSWORD',	'type' => 'password:25:100', 'explain' => false),
-		'table_prefix'			=> array('lang' => 'TABLE_PREFIX',	'type' => 'text:25:100', 'explain' => false),
+		'table_prefix'			=> array('lang' => 'TABLE_PREFIX',	'type' => 'text:25:100', 'explain' => true),
 	);
 	var $admin_config_options = array(
 		'legend1'				=> 'ADMIN_CONFIG',
-- 
cgit v1.2.1


From 3302305cd4a499603784aa87a40f5170d62a4f26 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 13 Nov 2011 16:11:32 +0100
Subject: [ticket/9066] Move regex into get_preg_expression function and add
 tests

PHPBB3-9066
---
 phpBB/install/install_install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index bb1d858cfc..ccdcf211f1 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -546,7 +546,7 @@ class install_install extends module
 				$error[] = $lang['INST_ERR_NO_DB'];
 				$connect_test = false;
 			}
-			else if (!preg_match('#^[a-zA-Z][a-zA-Z0-9_]*$#', $data['table_prefix'], $result))
+			else if (!preg_match(get_preg_expression('table_prefix'), $data['table_prefix']))
 			{
 				$error[] = $lang['INST_ERR_DB_INVALID_PREFIX'];
 				$connect_test = false;
-- 
cgit v1.2.1


From 815dd3591b2618f072791aeb7bf6d87492e690b0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 15 Nov 2011 17:23:55 +0100
Subject: [ticket/10185] Always set board startdate on conversion

The board startdate should always be set to first user registration date.
The current code did not do anything at all, as the board_startdate was always
set on installation before running the convertor.

PHPBB3-10185
---
 phpBB/install/install_convert.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 814b50cf68..62efc3e46b 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -1716,19 +1716,16 @@ class install_convert extends module
 
 			fix_empty_primary_groups();
 
-			if (!isset($config['board_startdate']))
-			{
-				$sql = 'SELECT MIN(user_regdate) AS board_startdate
-					FROM ' . USERS_TABLE;
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
+			$sql = 'SELECT MIN(user_regdate) AS board_startdate
+				FROM ' . USERS_TABLE;
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
 
-				if (($row['board_startdate'] < $config['board_startdate'] && $row['board_startdate'] > 0) || !isset($config['board_startdate']))
-				{
-					set_config('board_startdate', $row['board_startdate']);
-					$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_regdate = ' . $row['board_startdate'] . ' WHERE user_id = ' . ANONYMOUS);
-				}
+			if (!isset($config['board_startdate']) || ($row['board_startdate'] < $config['board_startdate'] && $row['board_startdate'] > 0))
+			{
+				set_config('board_startdate', $row['board_startdate']);
+				$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_regdate = ' . $row['board_startdate'] . ' WHERE user_id = ' . ANONYMOUS);
 			}
 
 			update_dynamic_config();
-- 
cgit v1.2.1


From 3091efc501c7e0d5d0a49cb496364f373a4d0184 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 17 Nov 2011 00:56:38 +0800
Subject: [ticket/9416] HTML entities in poll titles and options incorrectly
 re-encoded

PHPBB3-9416
---
 phpBB/install/convertors/convert_phpbb20.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 7f6e3c0250..789773e349 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -504,7 +504,7 @@ if (!$get_info)
 				array('topic_type',				'topics.topic_type',				'phpbb_convert_topic_type'),
 				array('topic_first_post_id',	'topics.topic_first_post_id',		''),
 				array('topic_last_view_time',	'posts.post_time',					'intval'),
-				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')),
+				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'htmlspecialchars_decode', 'function4' => 'utf8_htmlspecialchars')),
 				array('poll_start',				'vote_desc.vote_start',				'null_to_zero'),
 				array('poll_length',			'vote_desc.vote_length',			'null_to_zero'),
 				array('poll_max_options',		1,									''),
@@ -537,7 +537,7 @@ if (!$get_info)
 				array('topic_type',				'topics.topic_type',				'phpbb_convert_topic_type'),
 				array('topic_first_post_id',	'topics.topic_first_post_id',		''),
 
-				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')),
+				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'htmlspecialchars_decode', 'function4' => 'utf8_htmlspecialchars')),
 				array('poll_start',				'vote_desc.vote_start',				'null_to_zero'),
 				array('poll_length',			'vote_desc.vote_length',			'null_to_zero'),
 				array('poll_max_options',		1,									''),
@@ -582,7 +582,7 @@ if (!$get_info)
 				array('poll_option_id',			'vote_results.vote_option_id',		''),
 				array('topic_id',				'vote_desc.topic_id',				''),
 				array('',						'topics.topic_poster AS poster_id',	'phpbb_user_id'),
-				array('poll_option_text',		'vote_results.vote_option_text',	array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
+				array('poll_option_text',		'vote_results.vote_option_text',	array('function1' => 'phpbb_set_encoding', 'function2' => 'htmlspecialchars_decode', 'function3' => 'utf8_htmlspecialchars')),
 				array('poll_option_total',		'vote_results.vote_result',			''),
 
 				'where'			=> 'vote_results.vote_id = vote_desc.vote_id',
-- 
cgit v1.2.1


From 0c443a089c9884fc18566e8d184a199a0c03eb43 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 18 Nov 2011 17:09:53 +0100
Subject: [feature/extension-manager] Reference correct new module basenames in
 install

PHPBB3-10323
---
 phpBB/install/install_install.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 5ea3525edd..038a409c8f 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1604,7 +1604,7 @@ class install_install extends module
 				// Move main module 4 up...
 				$sql = 'SELECT *
 					FROM ' . MODULES_TABLE . "
-					WHERE module_basename = 'main'
+					WHERE module_basename = 'acp_main'
 						AND module_class = 'acp'
 						AND module_mode = 'main'";
 				$result = $db->sql_query($sql);
@@ -1616,7 +1616,7 @@ class install_install extends module
 				// Move permissions intro screen module 4 up...
 				$sql = 'SELECT *
 					FROM ' . MODULES_TABLE . "
-					WHERE module_basename = 'permissions'
+					WHERE module_basename = 'acp_permissions'
 						AND module_class = 'acp'
 						AND module_mode = 'intro'";
 				$result = $db->sql_query($sql);
@@ -1628,7 +1628,7 @@ class install_install extends module
 				// Move manage users screen module 5 up...
 				$sql = 'SELECT *
 					FROM ' . MODULES_TABLE . "
-					WHERE module_basename = 'users'
+					WHERE module_basename = 'acp_users'
 						AND module_class = 'acp'
 						AND module_mode = 'overview'";
 				$result = $db->sql_query($sql);
@@ -1643,7 +1643,7 @@ class install_install extends module
 				// Move attachment module 4 down...
 				$sql = 'SELECT *
 					FROM ' . MODULES_TABLE . "
-					WHERE module_basename = 'attachments'
+					WHERE module_basename = 'ucp_attachments'
 						AND module_class = 'ucp'
 						AND module_mode = 'attachments'";
 				$result = $db->sql_query($sql);
-- 
cgit v1.2.1


From 64d62038cd8e2e69eb101c5256ea458cff98ae10 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 20 Nov 2011 04:15:44 -0500
Subject: [ticket/10446] DRY X-AntiAbuse header addition.

PHPBB3-10446
---
 phpBB/install/install_install.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index ccdcf211f1..4a988bb80a 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1945,10 +1945,7 @@ class install_install extends module
 
 			$messenger->to($data['board_email1'], $data['admin_name']);
 
-			$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-			$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-			$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-			$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+			$messenger->anti_abuse_headers();
 
 			$messenger->assign_vars(array(
 				'USERNAME'		=> htmlspecialchars_decode($data['admin_name']),
-- 
cgit v1.2.1


From 37c766819346b830cf184fdfae9407006a621b17 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 20 Nov 2011 16:35:31 +0100
Subject: [ticket/10446] Pass $config and $user via parameter to
 anti_abuse_headers().

PHPBB3-10446
---
 phpBB/install/install_install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 4a988bb80a..8b073df44c 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1945,7 +1945,7 @@ class install_install extends module
 
 			$messenger->to($data['board_email1'], $data['admin_name']);
 
-			$messenger->anti_abuse_headers();
+			$messenger->anti_abuse_headers($config, $user);
 
 			$messenger->assign_vars(array(
 				'USERNAME'		=> htmlspecialchars_decode($data['admin_name']),
-- 
cgit v1.2.1


From 06ae98b1e557661528f53be08244f6fa7338d9b6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 20 Nov 2011 21:41:24 +0100
Subject: [develop-olympus] Bumping version numbers to final for 3.0.10
 releases.

---
 phpBB/install/convertors/convert_phpbb20.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 789773e349..81cc2f68f3 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -32,7 +32,7 @@ unset($dbpasswd);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.0.9',
+	'phpbb_version'	=> '3.0.10',
 	'author'		=> '<a href="http://www.phpbb.com/">phpBB Group</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
-- 
cgit v1.2.1


From 3e43b53a63743a81b27b53c01d57e4b73d994ae9 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 20 Nov 2011 21:50:29 +0100
Subject: [develop-olympus] Bump version numbers for 3.0.10-RC1 release.

---
 phpBB/install/database_update.php     | 8 +++++---
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 21246a215e..9ca011c8aa 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.10-dev');
+define('UPDATES_TO_VERSION', '3.0.10-RC1');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -951,7 +951,7 @@ function database_update_info()
 						// this column was removed from the database updater
 						// after 3.0.9-RC3 was released. It might still exist
 						// in 3.0.9-RCX installations and has to be dropped in
-						// 3.0.10 after the db_tools class is capable of properly
+						// 3.0.11 after the db_tools class is capable of properly
 						// removing a primary key.
 						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
 						'attempt_ip'			=> array('VCHAR:40', ''),
@@ -985,8 +985,10 @@ function database_update_info()
 		'3.0.9-RC3'     => array(),
 		// No changes from 3.0.9-RC4 to 3.0.9
 		'3.0.9-RC4'     => array(),
+		// No changes from 3.0.9 to 3.0.10-RC1
+		'3.0.9'			=> array(),
 
-		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
+		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 84b25d676e..4f5bf23c58 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,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.10-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10-RC1');
 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');
 
-- 
cgit v1.2.1


From a9d7b1f9a144a6354638e6ef30e42cec2463f1b8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 21 Nov 2011 00:57:53 +0100
Subject: [develop-olympus] Increment version number to 3.0.11-dev in
 develop-olympus.

---
 phpBB/install/database_update.php     | 2 +-
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9ca011c8aa..1d96f40fdf 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.10-RC1');
+define('UPDATES_TO_VERSION', '3.0.11-dev');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 4f5bf23c58..fcc372ae93 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,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.10-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-dev');
 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');
 
-- 
cgit v1.2.1


From 43818289fe91906bb5d095ea944f142fef8488b4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 23 Nov 2011 22:28:55 +0100
Subject: [ticket/10488] Only set $config['email_max_chunk_size'] when not
 already set.

PHPBB3-10488
---
 phpBB/install/database_update.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9ca011c8aa..57e2ef73b8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1999,7 +1999,12 @@ function change_database_data(&$no_updates, $version)
 
 		// Changes from 3.0.9 to 3.0.10-RC1
 		case '3.0.9':
-			set_config('email_max_chunk_size', '50');
+			if (!isset($config['email_max_chunk_size']))
+			{
+				set_config('email_max_chunk_size', '50');
+			}
+
+			$no_updates = false;
 		break;
 	}
 }
-- 
cgit v1.2.1


From 007457f18295cd4019684e1470110dd4b50de8cf Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 26 Nov 2011 22:17:43 +0100
Subject: [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.

---
 phpBB/install/database_update.php     | 9 ++++++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 57e2ef73b8..bbc4261adc 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.10-RC1');
+define('UPDATES_TO_VERSION', '3.0.10-RC2');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -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/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 4f5bf23c58..5cbaba3d1f 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,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.10-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10-RC2');
 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');
 
-- 
cgit v1.2.1


From 69cbb4ac1de7887af8fe16a771ac30c762a7b24a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 4 Dec 2011 00:22:10 +0100
Subject: [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.

---
 phpBB/install/database_update.php     | 9 +++++++--
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index bbc4261adc..eeadc9f862 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.10-RC2');
+define('UPDATES_TO_VERSION', '3.0.10-RC3');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -989,7 +989,8 @@ function database_update_info()
 		'3.0.9'			=> array(),
 		// No changes from 3.0.10-RC1 to 3.0.10-RC2
 		'3.0.10-RC1'	=> array(),
-
+		// No changes from 3.0.10-RC2 to 3.0.10-RC3
+		'3.0.10-RC2'	=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
@@ -2013,6 +2014,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.10-RC1 to 3.0.10-RC2
 		case '3.0.10-RC1':
 		break;
+
+		// No changes from 3.0.10-RC2 to 3.0.10-RC3
+		case '3.0.10-RC2':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5cbaba3d1f..eb90d3a06d 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,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.10-RC2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10-RC3');
 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');
 
-- 
cgit v1.2.1


From fc297a710e56d938afce83de401b103c72218a1b Mon Sep 17 00:00:00 2001
From: p <oleg@bsdpower.com>
Date: Fri, 23 Dec 2011 22:10:34 +0000
Subject: [ticket/10535] Delete email confirm from installer

PHPBB3-10535
---
 phpBB/install/install_install.php | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 21fe355447..cfef1861cf 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -690,7 +690,7 @@ class install_install extends module
 			$error = array();
 
 			// Check the entered email address and password
-			if ($data['admin_name'] == '' || $data['admin_pass1'] == '' || $data['admin_pass2'] == '' || $data['board_email1'] == '' || $data['board_email2'] == '')
+			if ($data['admin_name'] == '' || $data['admin_pass1'] == '' || $data['admin_pass2'] == '' || $data['board_email'] == '')
 			{
 				$error[] = $lang['INST_ERR_MISSING_DATA'];
 			}
@@ -722,12 +722,7 @@ class install_install extends module
 				$error[] = $lang['INST_ERR_PASSWORD_TOO_LONG'];
 			}
 
-			if ($data['board_email1'] != $data['board_email2'] && $data['board_email1'] != '')
-			{
-				$error[] = $lang['INST_ERR_EMAIL_MISMATCH'];
-			}
-
-			if ($data['board_email1'] != '' && !preg_match('/^' . get_preg_expression('email') . '$/i', $data['board_email1']))
+			if ($data['board_email'] != '' && !preg_match('/^' . get_preg_expression('email') . '$/i', $data['board_email']))
 			{
 				$error[] = $lang['INST_ERR_EMAIL_INVALID'];
 			}
@@ -1251,11 +1246,11 @@ class install_install extends module
 				WHERE config_name = 'server_port'",
 
 			'UPDATE ' . $data['table_prefix'] . "config
-				SET config_value = '" . $db->sql_escape($data['board_email1']) . "'
+				SET config_value = '" . $db->sql_escape($data['board_email']) . "'
 				WHERE config_name = 'board_email'",
 
 			'UPDATE ' . $data['table_prefix'] . "config
-				SET config_value = '" . $db->sql_escape($data['board_email1']) . "'
+				SET config_value = '" . $db->sql_escape($data['board_email']) . "'
 				WHERE config_name = 'board_contact'",
 
 			'UPDATE ' . $data['table_prefix'] . "config
@@ -1315,7 +1310,7 @@ class install_install extends module
 				WHERE config_name = 'avatar_salt'",
 
 			'UPDATE ' . $data['table_prefix'] . "users
-				SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(md5($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email1']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . $db->sql_escape(phpbb_email_hash($data['board_email1'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "'
+				SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(md5($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . $db->sql_escape(phpbb_email_hash($data['board_email'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "'
 				WHERE username = 'Admin'",
 
 			'UPDATE ' . $data['table_prefix'] . "moderator_cache
@@ -1831,7 +1826,7 @@ class install_install extends module
 
 			$messenger->template('installed', $data['language']);
 
-			$messenger->to($data['board_email1'], $data['admin_name']);
+			$messenger->to($data['board_email'], $data['admin_name']);
 
 			$messenger->anti_abuse_headers($config, $user);
 
@@ -1890,8 +1885,7 @@ class install_install extends module
 			'admin_name'	=> utf8_normalize_nfc(request_var('admin_name', '', true)),
 			'admin_pass1'	=> request_var('admin_pass1', '', true),
 			'admin_pass2'	=> request_var('admin_pass2', '', true),
-			'board_email1'	=> strtolower(request_var('board_email1', '')),
-			'board_email2'	=> strtolower(request_var('board_email2', '')),
+			'board_email'	=> strtolower(request_var('board_email', '')),
 			'img_imagick'	=> request_var('img_imagick', ''),
 			'ftp_path'		=> request_var('ftp_path', ''),
 			'ftp_user'		=> request_var('ftp_user', ''),
@@ -1930,8 +1924,7 @@ class install_install extends module
 		'admin_name'			=> array('lang' => 'ADMIN_USERNAME',			'type' => 'text:25:100', 'explain' => true),
 		'admin_pass1'			=> array('lang' => 'ADMIN_PASSWORD',			'type' => 'password:25:100', 'explain' => true),
 		'admin_pass2'			=> array('lang' => 'ADMIN_PASSWORD_CONFIRM',	'type' => 'password:25:100', 'explain' => false),
-		'board_email1'			=> array('lang' => 'CONTACT_EMAIL',				'type' => 'text:25:100', 'explain' => false),
-		'board_email2'			=> array('lang' => 'CONTACT_EMAIL_CONFIRM',		'type' => 'text:25:100', 'explain' => false),
+		'board_email'			=> array('lang' => 'CONTACT_EMAIL',				'type' => 'text:25:100', 'explain' => false),
 	);
 	var $advanced_config_options = array(
 		'legend1'				=> 'ACP_EMAIL_SETTINGS',
-- 
cgit v1.2.1


From 7a04c9048c110f0bd21ea3e9e869e17b408d640e Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 13:32:52 +0000
Subject: [ticket/9916] Updating header license and removing Version $Id$

PHPBB3-9916
---
 phpBB/install/convertors/convert_phpbb20.php   | 3 +--
 phpBB/install/convertors/functions_phpbb20.php | 3 +--
 phpBB/install/data/confusables.php             | 3 +--
 phpBB/install/data/new_normalizer.php          | 3 +--
 phpBB/install/database_update.php              | 2 +-
 phpBB/install/index.php                        | 3 +--
 phpBB/install/install_convert.php              | 3 +--
 phpBB/install/install_install.php              | 3 +--
 phpBB/install/install_main.php                 | 3 +--
 phpBB/install/install_update.php               | 3 +--
 10 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index d2f1b0637c..79c20b718d 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package install
-* @version $Id$
 * @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 9333bfe86d..aea6074637 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package install
-* @version $Id$
 * @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/install/data/confusables.php b/phpBB/install/data/confusables.php
index d8a835e26c..f5d3b11731 100644
--- a/phpBB/install/data/confusables.php
+++ b/phpBB/install/data/confusables.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package install
-* @version $Id$
 * @copyright (c) 2007 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/install/data/new_normalizer.php b/phpBB/install/data/new_normalizer.php
index 56cd78f76b..380998f530 100644
--- a/phpBB/install/data/new_normalizer.php
+++ b/phpBB/install/data/new_normalizer.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package install
-* @version $Id$
 * @copyright (c) 2007 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2b5ce4bf31..da906f0023 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -3,7 +3,7 @@
 *
 * @package install
 * @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index abe5d1e485..9d003ba6ab 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package install
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index c3b3dfcf66..5a868004ef 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package install
-* @version $Id$
 * @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 21fe355447..df9e47ddec 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package install
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/install/install_main.php b/phpBB/install/install_main.php
index aab7b19436..974b006db3 100644
--- a/phpBB/install/install_main.php
+++ b/phpBB/install/install_main.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package install
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 926b7cad46..9f50a56595 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package install
-* @version $Id$
 * @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 * @todo check for writable cache/store/files directory
 */
-- 
cgit v1.2.1


From e14c3f3b77ab07ce97f357a15db5db5101df06c1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 1 Jan 2012 16:00:17 +0100
Subject: [prep-release-3.0.10] Bumping version number for 3.0.10 final.

---
 phpBB/install/database_update.php     | 8 +++++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index eeadc9f862..5694c6e29f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.10-RC3');
+define('UPDATES_TO_VERSION', '3.0.10');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -991,6 +991,8 @@ function database_update_info()
 		'3.0.10-RC1'	=> array(),
 		// No changes from 3.0.10-RC2 to 3.0.10-RC3
 		'3.0.10-RC2'	=> array(),
+		// No changes from 3.0.10-RC3 to 3.0.10
+		'3.0.10-RC3'	=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
@@ -2018,6 +2020,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.10-RC2 to 3.0.10-RC3
 		case '3.0.10-RC2':
 		break;
+
+		// No changes from 3.0.10-RC3 to 3.0.10
+		case '3.0.10-RC3':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index eb90d3a06d..d7433d52fd 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,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.10-RC3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10');
 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');
 
-- 
cgit v1.2.1


From caeadf85d00ce90b8ea141bcb9a05d229ff1b5b4 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 9 Feb 2012 22:24:46 +0200
Subject: [ticket/10637] Leftovers from implementation of extensions in
 convertor

Replacing code in convertor that was missed in ticket 10323

PHPBB3-10637
---
 phpBB/install/install_convert.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 5a868004ef..db974f9903 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -735,22 +735,20 @@ class install_convert extends module
 			$this->p_master->error(sprintf($user->lang['COULD_NOT_FIND_PATH'], $convert->options['forum_path']), __LINE__, __FILE__);
 		}
 
-		$search_type = basename(trim($config['search_type']));
+		$search_type = $config['search_type'];
 
 		// For conversions we are a bit less strict and set to a search backend we know exist...
-		if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
+		if (!class_exists($search_type))
 		{
-			$search_type = 'fulltext_native';
+			$search_type = 'phpbb_search_fulltext_native';
 			set_config('search_type', $search_type);
 		}
 
-		if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
+		if (!class_exists($search_type))
 		{
 			trigger_error('NO_SUCH_SEARCH_MODULE');
 		}
 
-		require($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx);
-
 		$error = false;
 		$convert->fulltext_search = new $search_type($error);
 
-- 
cgit v1.2.1


From 45f39c6d1f2adc318d521bd9eb75d80f0750fdb8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 18 Feb 2012 12:16:21 +0100
Subject: [ticket/10605] Delete orphan private messages on update

PHPBB3-10605
---
 phpBB/install/database_update.php | 42 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a1b7dcd47f..b6298ca651 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2024,6 +2024,48 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.10-RC3 to 3.0.10
 		case '3.0.10-RC3':
 		break;
+
+		// Changes from 3.0.10 to 3.0.11-RC1
+		case '3.0.10':
+			// Delete orphan private messages
+			$batch_size = 500;
+
+			$sql_array = array(
+				'SELECT'	=> 'p.msg_id',
+				'FROM'		=> array(
+					PRIVMSGS_TABLE	=> 'p',
+				),
+				'LEFT_JOIN'	=> array(
+					array(
+						'FROM'	=> array(PRIVMSGS_TO_TABLE, 't'),
+						'ON'	=> 'p.msg_id = t.msg_id',
+					),
+				),
+				'WHERE'		=> 't.user_id IS NULL';
+			$sql = $db->sql_build_query('SELECT', $sql_array);
+
+			do
+			{
+				$result = $db->sql_query_limit($sql, $batch_size);
+
+				$delete_pms = array();
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$delete_pms[] = (int) $row['msg_id'];
+				}
+				$db->sql_freeresult($result);
+
+				if (!empty($delete_pms))
+				{
+					$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+						WHERE ' . $db->sql_in_set('msg_id', $delete_pms);
+					$db->sql_query($sql);
+				}
+			}
+			while (sizeof($delete_pms) == $batch_size);
+
+			$no_updates = false;
+		break;
 	}
 }
 
-- 
cgit v1.2.1


From e02d92ac62fbe1dc08994444c18a7447d72c56e6 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 11 Mar 2012 15:14:13 +0100
Subject: [feature/event-dispatcher] Use real EventDispatcher through composer

* replace the copy-pasta EventDispatcher with the real one from Symfony2
* use composer for managing this dependency, use composer autoloading

PHPBB3-9550
---
 phpBB/install/database_update.php | 2 ++
 phpBB/install/index.php           | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 843e8c2f23..a1c8fe1ef9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -82,6 +82,8 @@ if (!empty($load_extensions) && function_exists('dl'))
 	}
 }
 
+require($phpbb_root_path . 'vendor/.composer/autoload.php');
+
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 require($phpbb_root_path . 'includes/session.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 9d003ba6ab..7e150c2519 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -69,6 +69,8 @@ else
 }
 @ini_set('memory_limit', $mem_limit);
 
+require($phpbb_root_path . 'vendor/.composer/autoload.php');
+
 // Include essential scripts
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
-- 
cgit v1.2.1


From b7d84a586c1e253ff7075e80ab721db5c1101c9f Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Wed, 14 Mar 2012 23:12:11 +0200
Subject: [feature/merging-style-components] Renaming template classes

Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates)

PHPBB3-10632
---
 phpBB/install/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 9d003ba6ab..9b0dde1009 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -201,9 +201,9 @@ $config = new phpbb_config(array(
 	'load_tplcompile'	=> '1'
 ));
 
-$phpbb_template_locator = new phpbb_template_locator();
-$phpbb_template_path_provider = new phpbb_template_path_provider();
-$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_template_locator, $phpbb_template_path_provider);
+$phpbb_style_locator = new phpbb_style_locator();
+$phpbb_style_path_provider = new phpbb_style_path_provider();
+$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_locator, $phpbb_style_path_provider);
 $template->set_ext_dir_prefix('adm/');
 $template->set_custom_template('../adm/style', 'admin');
 $template->assign_var('T_ASSETS_PATH', '../assets');
-- 
cgit v1.2.1


From ae3b0f736d45690d37a10a453a98e598166e8506 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Wed, 14 Mar 2012 23:18:18 +0200
Subject: [feature/merging-style-components] Updating database and acp modules

Removing theme and template tables, adding new columns to styles table, deleting acp modules, deleting code that updates theme in updater

PHPBB3-10632
---
 phpBB/install/database_update.php         | 47 ++++++++++++++++----
 phpBB/install/install_update.php          | 58 ++----------------------
 phpBB/install/schemas/firebird_schema.sql | 57 ++----------------------
 phpBB/install/schemas/mssql_schema.sql    | 59 ++-----------------------
 phpBB/install/schemas/mysql_40_schema.sql | 35 +++------------
 phpBB/install/schemas/mysql_41_schema.sql | 35 +++------------
 phpBB/install/schemas/oracle_schema.sql   | 73 ++-----------------------------
 phpBB/install/schemas/postgres_schema.sql | 41 ++---------------
 phpBB/install/schemas/schema_data.sql     |  8 +---
 phpBB/install/schemas/sqlite_schema.sql   | 31 ++-----------
 10 files changed, 73 insertions(+), 371 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 843e8c2f23..995f4c9a95 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1088,6 +1088,12 @@ function database_update_info()
 				PROFILE_FIELDS_TABLE	=> array(
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
+				STYLES_TABLE		=> array(
+					'style_path'			=> array('VCHAR:100', ''),
+					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+					'style_parent_id'		=> array('UINT:4', 0),
+					'style_parent_tree'		=> array('TEXT', ''),
+				),
 			),
 			'change_columns'	=> array(
 				GROUPS_TABLE		=> array(
@@ -1097,20 +1103,16 @@ function database_update_info()
 			'drop_columns'      => array(
 			    STYLES_TABLE		    => array(
 			        'imageset_id',
+			        'template_id',
+			        'theme_id',
                 ),
-				STYLES_TEMPLATE_TABLE	=> array(
-					'template_storedb',
-				),
-				STYLES_THEME_TABLE		=> array(
-					'theme_storedb',
-					'theme_mtime',
-					'theme_data',
-				),
             ),
             'drop_tables'       => array(
                 STYLES_IMAGESET_TABLE,
                 STYLES_IMAGESET_DATA_TABLE,
+                STYLES_TEMPLATE_TABLE,
                 STYLES_TEMPLATE_DATA_TABLE,
+                STYLES_THEME_TABLE,
             ),
 		),
 	);
@@ -2267,12 +2269,33 @@ function change_database_data(&$no_updates, $version)
 					'auth'		=> 'acl_a_attach',
 					'cat'		=> 'ACP_ATTACHMENTS',
 				),
+				'install'	=> array(
+					'base'		=> 'acp_styles'
+					'class'		=> 'acp',
+					'title'		=> 'ACP_STYLES_INSTALL',
+					'auth'		=> 'acl_a_styles',
+					'cat'		=> 'ACP_STYLE_MANAGEMENT',
+				),
+				'edit'	=> array(
+					'base'		=> 'acp_styles'
+					'class'		=> 'acp',
+					'title'		=> 'ACP_STYLES_EDIT',
+					'auth'		=> 'acl_a_styles',
+					'cat'		=> 'ACP_STYLE_MANAGEMENT',
+				),
+				'cache'	=> array(
+					'base'		=> 'acp_styles'
+					'class'		=> 'acp',
+					'title'		=> 'ACP_STYLES_CACHE',
+					'auth'		=> 'acl_a_styles',
+					'cat'		=> 'ACP_STYLE_MANAGEMENT',
+				),
 			);
 
 			_add_modules($modules_to_install);
 
 			$sql = 'DELETE FROM ' . MODULES_TABLE . "
-			    WHERE module_basename = 'styles' AND module_mode = 'imageset'";
+			    WHERE (module_basename = 'styles' OR module_basename = 'acp_styles') AND (module_mode = 'imageset' OR module_mode = 'theme' OR module_mode = 'template')";
 			_sql($sql, $errored, $error_ary);
 
 			// Localise Global Announcements
@@ -2362,7 +2385,13 @@ function change_database_data(&$no_updates, $version)
 			{
 				set_config('teampage_memberships', '1');
 			}
+			
+			// Clear styles table and add prosilver entry
+			_sql('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
 
+			$sql = 'INSERT INTO ' . STYLES_TABLE . " (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '&copy; phpBB Group', 1, 'prosilver', 'kNg=', 0, '')";
+			_sql($sql, $errored, $error_ary);
+			
 			$no_updates = false;
 
 		break;
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 9f50a56595..aba692aa62 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -504,56 +504,6 @@ class install_update extends module
 					// Add database update to log
 					add_log('admin', 'LOG_UPDATE_PHPBB', $this->current_version, $this->update_to_version);
 
-					// Refresh prosilver css data - this may cause some unhappy users, but
-					$sql = 'SELECT *
-						FROM ' . STYLES_THEME_TABLE . "
-						WHERE LOWER(theme_name) = 'prosilver'";
-					$result = $db->sql_query($sql);
-					$theme = $db->sql_fetchrow($result);
-					$db->sql_freeresult($result);
-
-					if ($theme)
-					{
-						$recache = (empty($theme['theme_data'])) ? true : false;
-						$update_time = time();
-
-						// We test for stylesheet.css because it is faster and most likely the only file changed on common themes
-						if (!$recache && $theme['theme_mtime'] < @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css'))
-						{
-							$recache = true;
-							$update_time = @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css');
-						}
-						else if (!$recache)
-						{
-							$last_change = $theme['theme_mtime'];
-							$dir = @opendir("{$phpbb_root_path}styles/{$theme['theme_path']}/theme");
-
-							if ($dir)
-							{
-								while (($entry = readdir($dir)) !== false)
-								{
-									if (substr(strrchr($entry, '.'), 1) == 'css' && $last_change < @filemtime("{$phpbb_root_path}styles/{$theme['theme_path']}/theme/{$entry}"))
-									{
-										$recache = true;
-										break;
-									}
-								}
-								closedir($dir);
-							}
-						}
-
-						if ($recache)
-						{
-							// Instead of re-caching here, we simply remove theme_data... HAR HAR HAR (think about a carribean pirate)
-							$sql = 'UPDATE ' . STYLES_THEME_TABLE . " SET theme_data = ''
-								WHERE theme_id = " . $theme['theme_id'];
-							$db->sql_query($sql);
-
-							$cache->destroy('sql', STYLES_THEME_TABLE);
-							$cache->destroy('sql', STYLES_TABLE);
-						}
-					}
-
 					$db->sql_return_on_error(true);
 					$db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'version_update_from'");
 					$db->sql_return_on_error(false);
@@ -1694,9 +1644,9 @@ class install_update extends module
 					$info['custom'] = array();
 /*
 					// Get custom installed styles...
-					$sql = 'SELECT template_name, template_path
-						FROM ' . STYLES_TEMPLATE_TABLE . "
-						WHERE LOWER(template_name) NOT IN ('subsilver2', 'prosilver')";
+					$sql = 'SELECT style_name, style_path
+						FROM ' . STYLES_TABLE . "
+						WHERE LOWER(style_name) NOT IN ('subsilver2', 'prosilver')";
 					$result = $db->sql_query($sql);
 
 					$templates = array();
@@ -1715,7 +1665,7 @@ class install_update extends module
 							{
 								foreach ($templates as $row)
 								{
-									$info['custom'][$filename][] = str_replace('/prosilver/', '/' . $row['template_path'] . '/', $filename);
+									$info['custom'][$filename][] = str_replace('/prosilver/', '/' . $row['style_path'] . '/', $filename);
 								}
 							}
 						}
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index daeba45864..adea0b4cc2 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1086,15 +1086,15 @@ CREATE TABLE phpbb_styles (
 	style_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	style_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	style_active INTEGER DEFAULT 1 NOT NULL,
-	template_id INTEGER DEFAULT 0 NOT NULL,
-	theme_id INTEGER DEFAULT 0 NOT NULL
+	style_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT 'kNg=' NOT NULL,
+	style_parent_id INTEGER DEFAULT 0 NOT NULL,
+	style_parent_tree BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_styles ADD PRIMARY KEY (style_id);;
 
 CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles(style_name);;
-CREATE INDEX phpbb_styles_template_id ON phpbb_styles(template_id);;
-CREATE INDEX phpbb_styles_theme_id ON phpbb_styles(theme_id);;
 
 CREATE GENERATOR phpbb_styles_gen;;
 SET GENERATOR phpbb_styles_gen TO 0;;
@@ -1107,55 +1107,6 @@ BEGIN
 END;;
 
 
-# Table: 'phpbb_styles_template'
-CREATE TABLE phpbb_styles_template (
-	template_id INTEGER NOT NULL,
-	template_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
-	template_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
-	template_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT 'kNg=' NOT NULL,
-	template_inherits_id INTEGER DEFAULT 0 NOT NULL,
-	template_inherit_path VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
-);;
-
-ALTER TABLE phpbb_styles_template ADD PRIMARY KEY (template_id);;
-
-CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template(template_name);;
-
-CREATE GENERATOR phpbb_styles_template_gen;;
-SET GENERATOR phpbb_styles_template_gen TO 0;;
-
-CREATE TRIGGER t_phpbb_styles_template FOR phpbb_styles_template
-BEFORE INSERT
-AS
-BEGIN
-	NEW.template_id = GEN_ID(phpbb_styles_template_gen, 1);
-END;;
-
-
-# Table: 'phpbb_styles_theme'
-CREATE TABLE phpbb_styles_theme (
-	theme_id INTEGER NOT NULL,
-	theme_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
-	theme_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
-	theme_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL
-);;
-
-ALTER TABLE phpbb_styles_theme ADD PRIMARY KEY (theme_id);;
-
-CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme(theme_name);;
-
-CREATE GENERATOR phpbb_styles_theme_gen;;
-SET GENERATOR phpbb_styles_theme_gen TO 0;;
-
-CREATE TRIGGER t_phpbb_styles_theme FOR phpbb_styles_theme
-BEFORE INSERT
-AS
-BEGIN
-	NEW.theme_id = GEN_ID(phpbb_styles_theme_gen, 1);
-END;;
-
-
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
 	topic_id INTEGER NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 736917fdcb..292a85b816 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1322,8 +1322,10 @@ CREATE TABLE [phpbb_styles] (
 	[style_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[style_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[style_active] [int] DEFAULT (1) NOT NULL ,
-	[template_id] [int] DEFAULT (0) NOT NULL ,
-	[theme_id] [int] DEFAULT (0) NOT NULL 
+	[style_path] [varchar] (100) DEFAULT ('') NOT NULL ,
+	[bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL ,
+	[style_parent_id] [int] DEFAULT (0) NOT NULL ,
+	[style_parent_tree] [varchar] (8000) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
 GO
 
@@ -1337,59 +1339,6 @@ GO
 CREATE  UNIQUE  INDEX [style_name] ON [phpbb_styles]([style_name]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [template_id] ON [phpbb_styles]([template_id]) ON [PRIMARY]
-GO
-
-CREATE  INDEX [theme_id] ON [phpbb_styles]([theme_id]) ON [PRIMARY]
-GO
-
-
-/*
-	Table: 'phpbb_styles_template'
-*/
-CREATE TABLE [phpbb_styles_template] (
-	[template_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[template_name] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[template_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[template_path] [varchar] (100) DEFAULT ('') NOT NULL ,
-	[bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL ,
-	[template_inherits_id] [int] DEFAULT (0) NOT NULL ,
-	[template_inherit_path] [varchar] (255) DEFAULT ('') NOT NULL 
-) ON [PRIMARY]
-GO
-
-ALTER TABLE [phpbb_styles_template] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_styles_template] PRIMARY KEY  CLUSTERED 
-	(
-		[template_id]
-	)  ON [PRIMARY] 
-GO
-
-CREATE  UNIQUE  INDEX [tmplte_nm] ON [phpbb_styles_template]([template_name]) ON [PRIMARY]
-GO
-
-
-/*
-	Table: 'phpbb_styles_theme'
-*/
-CREATE TABLE [phpbb_styles_theme] (
-	[theme_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[theme_name] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[theme_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[theme_path] [varchar] (100) DEFAULT ('') NOT NULL 
-) ON [PRIMARY]
-GO
-
-ALTER TABLE [phpbb_styles_theme] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_styles_theme] PRIMARY KEY  CLUSTERED 
-	(
-		[theme_id]
-	)  ON [PRIMARY] 
-GO
-
-CREATE  UNIQUE  INDEX [theme_name] ON [phpbb_styles_theme]([theme_name]) ON [PRIMARY]
-GO
-
 
 /*
 	Table: 'phpbb_topics'
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 97c378621b..13d0199b8a 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -760,37 +760,12 @@ CREATE TABLE phpbb_styles (
 	style_name blob NOT NULL,
 	style_copyright blob NOT NULL,
 	style_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	template_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	theme_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (style_id),
-	UNIQUE style_name (style_name(255)),
-	KEY template_id (template_id),
-	KEY theme_id (theme_id)
-);
-
-
-# Table: 'phpbb_styles_template'
-CREATE TABLE phpbb_styles_template (
-	template_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	template_name blob NOT NULL,
-	template_copyright blob NOT NULL,
-	template_path varbinary(100) DEFAULT '' NOT NULL,
+	style_path varbinary(100) DEFAULT '' NOT NULL,
 	bbcode_bitfield varbinary(255) DEFAULT 'kNg=' NOT NULL,
-	template_inherits_id int(4) UNSIGNED DEFAULT '0' NOT NULL,
-	template_inherit_path varbinary(255) DEFAULT '' NOT NULL,
-	PRIMARY KEY (template_id),
-	UNIQUE tmplte_nm (template_name(255))
-);
-
-
-# Table: 'phpbb_styles_theme'
-CREATE TABLE phpbb_styles_theme (
-	theme_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	theme_name blob NOT NULL,
-	theme_copyright blob NOT NULL,
-	theme_path varbinary(100) DEFAULT '' NOT NULL,
-	PRIMARY KEY (theme_id),
-	UNIQUE theme_name (theme_name(255))
+	style_parent_id int(4) UNSIGNED DEFAULT '0' NOT NULL,
+	style_parent_tree blob NOT NULL,
+	PRIMARY KEY (style_id),
+	UNIQUE style_name (style_name(255))
 );
 
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 9615905625..c26cb89f37 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -760,37 +760,12 @@ CREATE TABLE phpbb_styles (
 	style_name varchar(255) DEFAULT '' NOT NULL,
 	style_copyright varchar(255) DEFAULT '' NOT NULL,
 	style_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	template_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	theme_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	PRIMARY KEY (style_id),
-	UNIQUE style_name (style_name),
-	KEY template_id (template_id),
-	KEY theme_id (theme_id)
-) CHARACTER SET `utf8` COLLATE `utf8_bin`;
-
-
-# Table: 'phpbb_styles_template'
-CREATE TABLE phpbb_styles_template (
-	template_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	template_name varchar(255) DEFAULT '' NOT NULL,
-	template_copyright varchar(255) DEFAULT '' NOT NULL,
-	template_path varchar(100) DEFAULT '' NOT NULL,
+	style_path varchar(100) DEFAULT '' NOT NULL,
 	bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL,
-	template_inherits_id int(4) UNSIGNED DEFAULT '0' NOT NULL,
-	template_inherit_path varchar(255) DEFAULT '' NOT NULL,
-	PRIMARY KEY (template_id),
-	UNIQUE tmplte_nm (template_name)
-) CHARACTER SET `utf8` COLLATE `utf8_bin`;
-
-
-# Table: 'phpbb_styles_theme'
-CREATE TABLE phpbb_styles_theme (
-	theme_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	theme_name varchar(255) DEFAULT '' NOT NULL,
-	theme_copyright varchar(255) DEFAULT '' NOT NULL,
-	theme_path varchar(100) DEFAULT '' NOT NULL,
-	PRIMARY KEY (theme_id),
-	UNIQUE theme_name (theme_name)
+	style_parent_id int(4) UNSIGNED DEFAULT '0' NOT NULL,
+	style_parent_tree text NOT NULL,
+	PRIMARY KEY (style_id),
+	UNIQUE style_name (style_name)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 5d60d2a19e..23bdebdb8a 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1444,17 +1444,15 @@ CREATE TABLE phpbb_styles (
 	style_name varchar2(765) DEFAULT '' ,
 	style_copyright varchar2(765) DEFAULT '' ,
 	style_active number(1) DEFAULT '1' NOT NULL,
-	template_id number(8) DEFAULT '0' NOT NULL,
-	theme_id number(8) DEFAULT '0' NOT NULL,
+	style_path varchar2(100) DEFAULT '' ,
+	bbcode_bitfield varchar2(255) DEFAULT 'kNg=' NOT NULL,
+	style_parent_id number(4) DEFAULT '0' NOT NULL,
+	style_parent_tree clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_styles PRIMARY KEY (style_id),
 	CONSTRAINT u_phpbb_style_name UNIQUE (style_name)
 )
 /
 
-CREATE INDEX phpbb_styles_template_id ON phpbb_styles (template_id)
-/
-CREATE INDEX phpbb_styles_theme_id ON phpbb_styles (theme_id)
-/
 
 CREATE SEQUENCE phpbb_styles_seq
 /
@@ -1472,69 +1470,6 @@ END;
 /
 
 
-/*
-	Table: 'phpbb_styles_template'
-*/
-CREATE TABLE phpbb_styles_template (
-	template_id number(8) NOT NULL,
-	template_name varchar2(765) DEFAULT '' ,
-	template_copyright varchar2(765) DEFAULT '' ,
-	template_path varchar2(100) DEFAULT '' ,
-	bbcode_bitfield varchar2(255) DEFAULT 'kNg=' NOT NULL,
-	template_inherits_id number(4) DEFAULT '0' NOT NULL,
-	template_inherit_path varchar2(255) DEFAULT '' ,
-	CONSTRAINT pk_phpbb_styles_template PRIMARY KEY (template_id),
-	CONSTRAINT u_phpbb_tmplte_nm UNIQUE (template_name)
-)
-/
-
-
-CREATE SEQUENCE phpbb_styles_template_seq
-/
-
-CREATE OR REPLACE TRIGGER t_phpbb_styles_template
-BEFORE INSERT ON phpbb_styles_template
-FOR EACH ROW WHEN (
-	new.template_id IS NULL OR new.template_id = 0
-)
-BEGIN
-	SELECT phpbb_styles_template_seq.nextval
-	INTO :new.template_id
-	FROM dual;
-END;
-/
-
-
-/*
-	Table: 'phpbb_styles_theme'
-*/
-CREATE TABLE phpbb_styles_theme (
-	theme_id number(8) NOT NULL,
-	theme_name varchar2(765) DEFAULT '' ,
-	theme_copyright varchar2(765) DEFAULT '' ,
-	theme_path varchar2(100) DEFAULT '' ,
-	CONSTRAINT pk_phpbb_styles_theme PRIMARY KEY (theme_id),
-	CONSTRAINT u_phpbb_theme_name UNIQUE (theme_name)
-)
-/
-
-
-CREATE SEQUENCE phpbb_styles_theme_seq
-/
-
-CREATE OR REPLACE TRIGGER t_phpbb_styles_theme
-BEFORE INSERT ON phpbb_styles_theme
-FOR EACH ROW WHEN (
-	new.theme_id IS NULL OR new.theme_id = 0
-)
-BEGIN
-	SELECT phpbb_styles_theme_seq.nextval
-	INTO :new.theme_id
-	FROM dual;
-END;
-/
-
-
 /*
 	Table: 'phpbb_topics'
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index d7377ac2e6..d18cb08539 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -994,47 +994,14 @@ CREATE TABLE phpbb_styles (
 	style_name varchar(255) DEFAULT '' NOT NULL,
 	style_copyright varchar(255) DEFAULT '' NOT NULL,
 	style_active INT2 DEFAULT '1' NOT NULL CHECK (style_active >= 0),
-	template_id INT4 DEFAULT '0' NOT NULL CHECK (template_id >= 0),
-	theme_id INT4 DEFAULT '0' NOT NULL CHECK (theme_id >= 0),
+	style_path varchar(100) DEFAULT '' NOT NULL,
+	bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL,
+	style_parent_id INT4 DEFAULT '0' NOT NULL CHECK (style_parent_id >= 0),
+	style_parent_tree varchar(8000) DEFAULT '' NOT NULL,
 	PRIMARY KEY (style_id)
 );
 
 CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name);
-CREATE INDEX phpbb_styles_template_id ON phpbb_styles (template_id);
-CREATE INDEX phpbb_styles_theme_id ON phpbb_styles (theme_id);
-
-/*
-	Table: 'phpbb_styles_template'
-*/
-CREATE SEQUENCE phpbb_styles_template_seq;
-
-CREATE TABLE phpbb_styles_template (
-	template_id INT4 DEFAULT nextval('phpbb_styles_template_seq'),
-	template_name varchar(255) DEFAULT '' NOT NULL,
-	template_copyright varchar(255) DEFAULT '' NOT NULL,
-	template_path varchar(100) DEFAULT '' NOT NULL,
-	bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL,
-	template_inherits_id INT4 DEFAULT '0' NOT NULL CHECK (template_inherits_id >= 0),
-	template_inherit_path varchar(255) DEFAULT '' NOT NULL,
-	PRIMARY KEY (template_id)
-);
-
-CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (template_name);
-
-/*
-	Table: 'phpbb_styles_theme'
-*/
-CREATE SEQUENCE phpbb_styles_theme_seq;
-
-CREATE TABLE phpbb_styles_theme (
-	theme_id INT4 DEFAULT nextval('phpbb_styles_theme_seq'),
-	theme_name varchar(255) DEFAULT '' NOT NULL,
-	theme_copyright varchar(255) DEFAULT '' NOT NULL,
-	theme_path varchar(100) DEFAULT '' NOT NULL,
-	PRIMARY KEY (theme_id)
-);
-
-CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme (theme_name);
 
 /*
 	Table: 'phpbb_topics'
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 3255cafea2..43b09c97f7 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -437,13 +437,7 @@ INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order)
 INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', 10);
 
 # -- phpbb_styles
-INSERT INTO phpbb_styles (style_name, style_copyright, style_active, template_id, theme_id) VALUES ('prosilver', '&copy; phpBB Group', 1, 1, 1);
-
-# -- phpbb_styles_template
-INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield) VALUES ('prosilver', '&copy; phpBB Group', 'prosilver', 'lNg=');
-
-# -- phpbb_styles_theme
-INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path) VALUES ('prosilver', '&copy; phpBB Group', 'prosilver');
+INSERT INTO phpbb_styles (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '&copy; phpBB Group', 1, 'prosilver', 'kNg=', 0, '');
 
 # -- 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, forum_parents) VALUES ('{L_FORUMS_FIRST_CATEGORY}', '', 1, 4, 0, 0, 1, 1, 1, 1, 2, 'Admin', 'AA0000', 972086460, '', '', '', '', '', '', '', 0, 0, '');
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 257937275c..c5f417961d 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -736,36 +736,13 @@ CREATE TABLE phpbb_styles (
 	style_name varchar(255) NOT NULL DEFAULT '',
 	style_copyright varchar(255) NOT NULL DEFAULT '',
 	style_active INTEGER UNSIGNED NOT NULL DEFAULT '1',
-	template_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	theme_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
-);
-
-CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name);
-CREATE INDEX phpbb_styles_template_id ON phpbb_styles (template_id);
-CREATE INDEX phpbb_styles_theme_id ON phpbb_styles (theme_id);
-
-# Table: 'phpbb_styles_template'
-CREATE TABLE phpbb_styles_template (
-	template_id INTEGER PRIMARY KEY NOT NULL ,
-	template_name varchar(255) NOT NULL DEFAULT '',
-	template_copyright varchar(255) NOT NULL DEFAULT '',
-	template_path varchar(100) NOT NULL DEFAULT '',
+	style_path varchar(100) NOT NULL DEFAULT '',
 	bbcode_bitfield varchar(255) NOT NULL DEFAULT 'kNg=',
-	template_inherits_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	template_inherit_path varchar(255) NOT NULL DEFAULT ''
+	style_parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	style_parent_tree text(65535) NOT NULL DEFAULT ''
 );
 
-CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (template_name);
-
-# Table: 'phpbb_styles_theme'
-CREATE TABLE phpbb_styles_theme (
-	theme_id INTEGER PRIMARY KEY NOT NULL ,
-	theme_name varchar(255) NOT NULL DEFAULT '',
-	theme_copyright varchar(255) NOT NULL DEFAULT '',
-	theme_path varchar(100) NOT NULL DEFAULT ''
-);
-
-CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme (theme_name);
+CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name);
 
 # Table: 'phpbb_topics'
 CREATE TABLE phpbb_topics (
-- 
cgit v1.2.1


From af789040b8880f908df0a26d5239d07d77c34124 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Wed, 7 Jul 2010 23:23:11 +0100
Subject: [feature/new-tz-handling] Modify database schemas.

- Dropped the user_dst column which is no longer required.
- Modified the user_timezone column to take a string, max length 100.

PHPBB3-9558
---
 phpBB/install/schemas/firebird_schema.sql | 3 +--
 phpBB/install/schemas/mssql_schema.sql    | 3 +--
 phpBB/install/schemas/mysql_40_schema.sql | 3 +--
 phpBB/install/schemas/mysql_41_schema.sql | 3 +--
 phpBB/install/schemas/oracle_schema.sql   | 3 +--
 phpBB/install/schemas/postgres_schema.sql | 3 +--
 phpBB/install/schemas/sqlite_schema.sql   | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index daeba45864..f4b1c624d7 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1290,8 +1290,7 @@ CREATE TABLE phpbb_users (
 	user_inactive_time INTEGER DEFAULT 0 NOT NULL,
 	user_posts INTEGER DEFAULT 0 NOT NULL,
 	user_lang VARCHAR(30) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	user_timezone DOUBLE PRECISION DEFAULT 0 NOT NULL,
-	user_dst INTEGER DEFAULT 0 NOT NULL,
+	user_timezone VARCHAR(100) CHARACTER SET NONE DEFAULT 'UTC' NOT NULL,
 	user_dateformat VARCHAR(30) CHARACTER SET UTF8 DEFAULT 'd M Y H:i' NOT NULL COLLATE UNICODE,
 	user_style INTEGER DEFAULT 0 NOT NULL,
 	user_rank INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 736917fdcb..fc1afcbbff 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1576,8 +1576,7 @@ CREATE TABLE [phpbb_users] (
 	[user_inactive_time] [int] DEFAULT (0) NOT NULL ,
 	[user_posts] [int] DEFAULT (0) NOT NULL ,
 	[user_lang] [varchar] (30) DEFAULT ('') NOT NULL ,
-	[user_timezone] [float] DEFAULT (0) NOT NULL ,
-	[user_dst] [int] DEFAULT (0) NOT NULL ,
+	[user_timezone] [varchar] (100) DEFAULT ('UTC') NOT NULL ,
 	[user_dateformat] [varchar] (30) DEFAULT ('d M Y H:i') NOT NULL ,
 	[user_style] [int] DEFAULT (0) NOT NULL ,
 	[user_rank] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 97c378621b..76b9294987 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -914,8 +914,7 @@ CREATE TABLE phpbb_users (
 	user_inactive_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_lang varbinary(30) DEFAULT '' NOT NULL,
-	user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
-	user_dst tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	user_timezone varbinary(100) DEFAULT 'UTC' NOT NULL,
 	user_dateformat varbinary(90) DEFAULT 'd M Y H:i' NOT NULL,
 	user_style mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 9615905625..30fb7a8623 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -914,8 +914,7 @@ CREATE TABLE phpbb_users (
 	user_inactive_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_lang varchar(30) DEFAULT '' NOT NULL,
-	user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
-	user_dst tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	user_timezone varchar(100) DEFAULT 'UTC' NOT NULL,
 	user_dateformat varchar(30) DEFAULT 'd M Y H:i' NOT NULL,
 	user_style mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 5d60d2a19e..a4b8686948 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1702,8 +1702,7 @@ CREATE TABLE phpbb_users (
 	user_inactive_time number(11) DEFAULT '0' NOT NULL,
 	user_posts number(8) DEFAULT '0' NOT NULL,
 	user_lang varchar2(30) DEFAULT '' ,
-	user_timezone number(5, 2) DEFAULT '0' NOT NULL,
-	user_dst number(1) DEFAULT '0' NOT NULL,
+	user_timezone varchar2(100) DEFAULT 'UTC' NOT NULL,
 	user_dateformat varchar2(90) DEFAULT 'd M Y H:i' NOT NULL,
 	user_style number(8) DEFAULT '0' NOT NULL,
 	user_rank number(8) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index d7377ac2e6..7138c818ff 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1172,8 +1172,7 @@ CREATE TABLE phpbb_users (
 	user_inactive_time INT4 DEFAULT '0' NOT NULL CHECK (user_inactive_time >= 0),
 	user_posts INT4 DEFAULT '0' NOT NULL CHECK (user_posts >= 0),
 	user_lang varchar(30) DEFAULT '' NOT NULL,
-	user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
-	user_dst INT2 DEFAULT '0' NOT NULL CHECK (user_dst >= 0),
+	user_timezone varchar(100) DEFAULT 'UTC' NOT NULL,
 	user_dateformat varchar(30) DEFAULT 'd M Y H:i' NOT NULL,
 	user_style INT4 DEFAULT '0' NOT NULL CHECK (user_style >= 0),
 	user_rank INT4 DEFAULT '0' NOT NULL CHECK (user_rank >= 0),
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 257937275c..5066ac97df 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -886,8 +886,7 @@ CREATE TABLE phpbb_users (
 	user_inactive_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_posts INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_lang varchar(30) NOT NULL DEFAULT '',
-	user_timezone decimal(5,2) NOT NULL DEFAULT '0',
-	user_dst INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_timezone varchar(100) NOT NULL DEFAULT 'UTC',
 	user_dateformat varchar(30) NOT NULL DEFAULT 'd M Y H:i',
 	user_style INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_rank INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
cgit v1.2.1


From b672fc7ae113c0e01f1d7ce4ffae3eb26e57b586 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 26 Apr 2011 22:11:45 -0400
Subject: [feature/new-tz-handling] Started on database updater changes.

The changes are tricky since we need to drop user_dst column from
users table, but we need it during the data migration process to
properly calculate effective timezones for all users.

The change here converts user_timezone to vchar and computes
timezone identifiers from the offsets. It uses database-specific
functions for building SQL conditionals and concatenations which
need to be implemented, probably in a separate ticket. As a result
the current code is not functional.

PHPBB3-9558
---
 phpBB/install/database_update.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index fa0fba9dc7..9d550cf938 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1090,6 +1090,9 @@ function database_update_info()
 				GROUPS_TABLE		=> array(
 					'group_legend'		=> array('UINT', 0),
 				),
+				USERS_TABLE			=> array(
+					'user_timezone'		=> array('VCHAR:100', ''),
+				),
 			),
 			'drop_columns'      => array(
 			    STYLES_TABLE		    => array(
@@ -2352,6 +2355,25 @@ function change_database_data(&$no_updates, $version)
 				set_config('teampage_memberships', '1');
 			}
 
+			// Update timezones
+			// user_dst is 0 if not in dst and 1 if in dst;
+			// this happens to be exactly the correction that should be added to the timezone offset
+			// to obtain dst offset.
+			// Parenthesize here because we operate on this value later.
+			$active_offset = '(user_timezone + user_dst)';
+			// Now we have a tricky problem of forcing the plus sign into the expression.
+			// Build it via a conditional since there cannot be a portable printf equivalent in databases.
+			// Note that active offset is not an absolute value here - it is an expression that will
+			// be evaluated by the database during query execution.
+			// We don't print - here because it will come from active offset.
+			$sign = $db->conditional_sql("$active_offset < 0", '', '+');
+			// Use database-specific escaping because strings are quoted differently by different databases.
+			$new_value = $db->concatenate_sql($db->sql_escape('GMT'), $sign, $active_offset);
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_timezone = ' . $new_value;
+			_sql($sql, $errored, $error_ary);
+			// After we have calculated the timezones we can delete user_dst column from user table.
+
 			$no_updates = false;
 		break;
 	}
-- 
cgit v1.2.1


From 3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 15 Mar 2012 13:13:21 +0200
Subject: [feature/merging-style-components] Creating style class

Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632
---
 phpBB/install/index.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 9b0dde1009..7c6dd10d03 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -201,9 +201,8 @@ $config = new phpbb_config(array(
 	'load_tplcompile'	=> '1'
 ));
 
-$phpbb_style_locator = new phpbb_style_locator();
-$phpbb_style_path_provider = new phpbb_style_path_provider();
-$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_locator, $phpbb_style_path_provider);
+$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false);
+$template = $style->template;
 $template->set_ext_dir_prefix('adm/');
 $template->set_custom_template('../adm/style', 'admin');
 $template->assign_var('T_ASSETS_PATH', '../assets');
-- 
cgit v1.2.1


From fd96f97dc3c659e1d2e9b58420d652ad79387fbf Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 15 Mar 2012 21:11:34 +0200
Subject: [feature/merging-style-components] Updating style initialization

Changing template initialization to style initialization.

PHPBB3-10632
---
 phpBB/install/index.php          | 4 ++--
 phpBB/install/install_update.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 7c6dd10d03..1f013df72b 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -202,9 +202,9 @@ $config = new phpbb_config(array(
 ));
 
 $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false);
+$style->set_ext_dir_prefix('adm/');
+$style->set_custom_style('admin', '../adm/style', '');
 $template = $style->template;
-$template->set_ext_dir_prefix('adm/');
-$template->set_custom_template('../adm/style', 'admin');
 $template->assign_var('T_ASSETS_PATH', '../assets');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
 
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index aba692aa62..dcf01e5cc8 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -71,7 +71,7 @@ class install_update extends module
 
 	function main($mode, $sub)
 	{
-		global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
+		global $style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
 		global $request;
 
 		$this->tpl_name = 'install_update';
@@ -131,7 +131,7 @@ class install_update extends module
 		}
 
 		// Set custom template again. ;)
-		$template->set_custom_template('../adm/style', 'admin');
+		$style->set_custom_style('admin', '../adm/style', '');
 
 		$template->assign_vars(array(
 			'S_USER_LANG'			=> $user->lang['USER_LANG'],
-- 
cgit v1.2.1


From 0af7d610c08307fbe8df20e0d44e54dcb9429d64 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 17 Mar 2012 22:45:27 -0400
Subject: [feature/event-dispatcher] Delete hard dependency on composer.

Applications should not depend on package managers.

PHPBB3-9550
---
 phpBB/install/database_update.php | 2 --
 phpBB/install/index.php           | 2 --
 2 files changed, 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a1c8fe1ef9..843e8c2f23 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -82,8 +82,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 	}
 }
 
-require($phpbb_root_path . 'vendor/.composer/autoload.php');
-
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 require($phpbb_root_path . 'includes/session.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 7e150c2519..9d003ba6ab 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -69,8 +69,6 @@ else
 }
 @ini_set('memory_limit', $mem_limit);
 
-require($phpbb_root_path . 'vendor/.composer/autoload.php');
-
 // Include essential scripts
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
-- 
cgit v1.2.1


From 95b5109c622f8acd2d57343b97e3c2b6b157863a Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 25 Jan 2012 14:30:52 +0000
Subject: [feature/save-post-on-report] The complete changes for this feature

This covers all the changes so that when a report is made, the post
itself is copied and displayed in the MCP instead of the current post.
Unfortunatly, I made all commits in the wrong way and they were lost.
Now I have only the final files.
---
 phpBB/install/database_update.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 843e8c2f23..0a2c3998c4 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1088,6 +1088,9 @@ function database_update_info()
 				PROFILE_FIELDS_TABLE	=> array(
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
+				REPORTS_TABLE		=> array(
+					'reported_post'			=> array('TEXT', ''),
+				),
 			),
 			'change_columns'	=> array(
 				GROUPS_TABLE		=> array(
-- 
cgit v1.2.1


From c241a4a2b484b561b5515c6f8211a21d39fd8d78 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Fri, 3 Feb 2012 20:54:24 +0000
Subject: [feature/save-post-on-report] Saves the post reported when a report
 is creat

A problem when creating a report is that the report may be made and then
the post changed. After the changes, if the report is seen the message
it shows may not be correct to be reported. With these changes, when
a report is created the system copies the post that was reported and
shows it in the report details in the MCP

PHPBB3-10600
---
 phpBB/install/schemas/firebird_schema.sql | 3 ++-
 phpBB/install/schemas/mssql_schema.sql    | 3 ++-
 phpBB/install/schemas/mysql_40_schema.sql | 1 +
 phpBB/install/schemas/mysql_41_schema.sql | 1 +
 phpBB/install/schemas/oracle_schema.sql   | 1 +
 phpBB/install/schemas/postgres_schema.sql | 1 +
 phpBB/install/schemas/sqlite_schema.sql   | 3 ++-
 7 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index daeba45864..518f1bcd4f 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -909,7 +909,8 @@ CREATE TABLE phpbb_reports (
 	user_notify INTEGER DEFAULT 0 NOT NULL,
 	report_closed INTEGER DEFAULT 0 NOT NULL,
 	report_time INTEGER DEFAULT 0 NOT NULL,
-	report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
+	report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
+	reported_post BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 736917fdcb..526ce0f65b 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1108,7 +1108,8 @@ CREATE TABLE [phpbb_reports] (
 	[user_notify] [int] DEFAULT (0) NOT NULL ,
 	[report_closed] [int] DEFAULT (0) NOT NULL ,
 	[report_time] [int] DEFAULT (0) NOT NULL ,
-	[report_text] [text] DEFAULT ('') NOT NULL 
+	[report_text] [text] DEFAULT ('') NOT NULL ,
+	[reported_post] [text] DEFAULT ('') NOT NULL 
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 97c378621b..22276b0d1f 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -647,6 +647,7 @@ CREATE TABLE phpbb_reports (
 	report_closed tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumblob NOT NULL,
+	reported_post mediumblob NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 9615905625..7513b4518d 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -647,6 +647,7 @@ CREATE TABLE phpbb_reports (
 	report_closed tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumtext NOT NULL,
+	reported_post mediumtext NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 5d60d2a19e..3982686c0d 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1214,6 +1214,7 @@ CREATE TABLE phpbb_reports (
 	report_closed number(1) DEFAULT '0' NOT NULL,
 	report_time number(11) DEFAULT '0' NOT NULL,
 	report_text clob DEFAULT '' ,
+	reported_post clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index d7377ac2e6..69685e45aa 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -853,6 +853,7 @@ CREATE TABLE phpbb_reports (
 	report_closed INT2 DEFAULT '0' NOT NULL CHECK (report_closed >= 0),
 	report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0),
 	report_text TEXT DEFAULT '' NOT NULL,
+	reported_post TEXT DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id)
 );
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 257937275c..3916493bea 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -627,7 +627,8 @@ CREATE TABLE phpbb_reports (
 	user_notify INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	report_closed INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	report_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	report_text mediumtext(16777215) NOT NULL DEFAULT ''
+	report_text mediumtext(16777215) NOT NULL DEFAULT '',
+	reported_post mediumtext(16777215) NOT NULL DEFAULT ''
 );
 
 CREATE INDEX phpbb_reports_post_id ON phpbb_reports (post_id);
-- 
cgit v1.2.1


From 6f5c0dddfcd2a1b56fe1e8cf783f48ecfc8561e9 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Tue, 14 Feb 2012 07:58:30 +0000
Subject: [feature/save-post-on-report] Bug fix table name

There was a bug in the previous commit. I changed the name
of the colon of the table and forgot to update the database_update.php
now it's fixed.

PHPBB3-10600
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0a2c3998c4..7240e899a6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1089,7 +1089,7 @@ function database_update_info()
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
 				REPORTS_TABLE		=> array(
-					'reported_post'			=> array('TEXT', ''),
+					'reported_text'			=> array('TEXT', ''),
 				),
 			),
 			'change_columns'	=> array(
-- 
cgit v1.2.1


From 18373035c3299e80b2c075cfc3d475c89af3cc73 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 15 Feb 2012 22:03:32 +0000
Subject: [feature/save-post-on-report] Changed the name of the column

The name of the column was changed from reported_post AND
reported_text to reported_post_text.
This change was made by request

PHPBB3-10600
---
 phpBB/install/database_update.php         | 2 +-
 phpBB/install/schemas/firebird_schema.sql | 2 +-
 phpBB/install/schemas/mssql_schema.sql    | 2 +-
 phpBB/install/schemas/mysql_40_schema.sql | 2 +-
 phpBB/install/schemas/mysql_41_schema.sql | 2 +-
 phpBB/install/schemas/oracle_schema.sql   | 2 +-
 phpBB/install/schemas/postgres_schema.sql | 2 +-
 phpBB/install/schemas/sqlite_schema.sql   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7240e899a6..2fdbd16e4a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1089,7 +1089,7 @@ function database_update_info()
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
 				REPORTS_TABLE		=> array(
-					'reported_text'			=> array('TEXT', ''),
+					'reported_post_text'	=> array('TEXT', ''),
 				),
 			),
 			'change_columns'	=> array(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 518f1bcd4f..b88ed0a64a 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -910,7 +910,7 @@ CREATE TABLE phpbb_reports (
 	report_closed INTEGER DEFAULT 0 NOT NULL,
 	report_time INTEGER DEFAULT 0 NOT NULL,
 	report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
-	reported_post BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
+	reported_post_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 526ce0f65b..a0399756e9 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1109,7 +1109,7 @@ CREATE TABLE [phpbb_reports] (
 	[report_closed] [int] DEFAULT (0) NOT NULL ,
 	[report_time] [int] DEFAULT (0) NOT NULL ,
 	[report_text] [text] DEFAULT ('') NOT NULL ,
-	[reported_post] [text] DEFAULT ('') NOT NULL 
+	[reported_post_text] [text] DEFAULT ('') NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 22276b0d1f..69648c6b14 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -647,7 +647,7 @@ CREATE TABLE phpbb_reports (
 	report_closed tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumblob NOT NULL,
-	reported_post mediumblob NOT NULL,
+	reported_post_text mediumblob NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 7513b4518d..9b32ee19c6 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -647,7 +647,7 @@ CREATE TABLE phpbb_reports (
 	report_closed tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	report_text mediumtext NOT NULL,
-	reported_post mediumtext NOT NULL,
+	reported_post_text mediumtext NOT NULL,
 	PRIMARY KEY (report_id),
 	KEY post_id (post_id),
 	KEY pm_id (pm_id)
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 3982686c0d..032c8633dd 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1214,7 +1214,7 @@ CREATE TABLE phpbb_reports (
 	report_closed number(1) DEFAULT '0' NOT NULL,
 	report_time number(11) DEFAULT '0' NOT NULL,
 	report_text clob DEFAULT '' ,
-	reported_post clob DEFAULT '' ,
+	reported_post_text clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 69685e45aa..f482920776 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -853,7 +853,7 @@ CREATE TABLE phpbb_reports (
 	report_closed INT2 DEFAULT '0' NOT NULL CHECK (report_closed >= 0),
 	report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0),
 	report_text TEXT DEFAULT '' NOT NULL,
-	reported_post TEXT DEFAULT '' NOT NULL,
+	reported_post_text TEXT DEFAULT '' NOT NULL,
 	PRIMARY KEY (report_id)
 );
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 3916493bea..56468bcdd9 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -628,7 +628,7 @@ CREATE TABLE phpbb_reports (
 	report_closed INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	report_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	report_text mediumtext(16777215) NOT NULL DEFAULT '',
-	reported_post mediumtext(16777215) NOT NULL DEFAULT ''
+	reported_post_text mediumtext(16777215) NOT NULL DEFAULT ''
 );
 
 CREATE INDEX phpbb_reports_post_id ON phpbb_reports (post_id);
-- 
cgit v1.2.1


From 165a2d1aa879f1fc65448721da5f6d143aff91fe Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 8 Mar 2012 09:16:36 +0000
Subject: [feature/save-post-on-report] Change the column type of reported text

What ever it said. I changed the type of data in the column
reported_post_text to match what was requested by p

PHPBB3-10600
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2fdbd16e4a..8a7ec1004e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1089,7 +1089,7 @@ function database_update_info()
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
 				REPORTS_TABLE		=> array(
-					'reported_post_text'	=> array('TEXT', ''),
+					'reported_post_text'	=> array('MTEXT_UNI', ''),
 				),
 			),
 			'change_columns'	=> array(
-- 
cgit v1.2.1


From 75e731e14b219d5b926755e01b957a5640f26ac8 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 8 Mar 2012 17:31:19 -0500
Subject: [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2

PHPBB3-10693
---
 phpBB/install/install_install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 4663b5204e..361376763d 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -140,7 +140,7 @@ class install_install extends module
 		// Test the minimum PHP version
 		$php_version = PHP_VERSION;
 
-		if (version_compare($php_version, '5.2.0') < 0)
+		if (version_compare($php_version, '5.3.2') < 0)
 		{
 			$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
 		}
-- 
cgit v1.2.1


From 063f6893af754cc992e487d323f766889bebba01 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 8 Mar 2012 18:04:24 -0500
Subject: [task/php5.3] Looks like I missed a few places that needed PHP 5.2
 changed to PHP 5.3.2

PHPBB3-10693
---
 phpBB/install/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 9d003ba6ab..f180511e46 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -17,9 +17,9 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-if (version_compare(PHP_VERSION, '5.2.0') < 0)
+if (version_compare(PHP_VERSION, '5.3.2') < 0)
 {
-	die('You are running an unsupported PHP version. Please upgrade to PHP 5.2.0 or higher before trying to install phpBB 3.1');
+	die('You are running an unsupported PHP version. Please upgrade to PHP 5.3.2 or higher before trying to install phpBB 3.1');
 }
 
 function phpbb_require_updated($path, $optional = false)
-- 
cgit v1.2.1


From 7f1abaa318cb7008c9eab259003d67790e346094 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 28 Mar 2012 21:45:56 +0200
Subject: [feature/event-dispatcher] Add empty dispatcher to installer and db
 updater

PHPBB3-9550
---
 phpBB/install/database_update.php | 1 +
 phpBB/install/index.php           | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 843e8c2f23..c2b36f5992 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -120,6 +120,7 @@ $cache = $cache_factory->get_service();
 $phpbb_class_loader_ext->set_cache($cache->get_driver());
 $phpbb_class_loader->set_cache($cache->get_driver());
 
+$phpbb_dispatcher = new phpbb_event_dispatcher();
 $request = new phpbb_request();
 $user = new user();
 $db = new $sql_db();
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 9d003ba6ab..8191288f9d 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -92,6 +92,7 @@ $cache = $cache_factory->get_service();
 $phpbb_class_loader_ext->set_cache($cache->get_driver());
 $phpbb_class_loader->set_cache($cache->get_driver());
 
+$phpbb_dispatcher = new phpbb_event_dispatcher();
 $request = new phpbb_request();
 
 // make sure request_var uses this request instance
-- 
cgit v1.2.1


From 360312f599edd852e14fcd162552e19dd2d278a6 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 31 Mar 2012 17:38:30 +0300
Subject: [feature/merging-style-components] Initializing locator and provider
 separately

Moving locator and path provider initialization out of style class

PHPBB3-10632
---
 phpBB/install/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 49f7847489..fdce7234e5 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -202,7 +202,9 @@ $config = new phpbb_config(array(
 	'load_tplcompile'	=> '1'
 ));
 
-$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false);
+$phpbb_style_resource_locator = new phpbb_style_resource_locator();
+$phpbb_style_path_provider = new phpbb_style_path_provider();
+$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
 $style->set_ext_dir_prefix('adm/');
 $style->set_custom_style('admin', '../adm/style', '');
 $template = $style->template;
-- 
cgit v1.2.1


From 17989c17a040a28aeeefcf55f6cca054b28c06ed Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 31 Mar 2012 18:10:00 +0300
Subject: [feature/merging-style-components] Moving template initialization out
 of style

Moving template initialization out of style constructor

PHPBB3-10632
---
 phpBB/install/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index fdce7234e5..6c32a322f8 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -204,10 +204,10 @@ $config = new phpbb_config(array(
 
 $phpbb_style_resource_locator = new phpbb_style_resource_locator();
 $phpbb_style_path_provider = new phpbb_style_path_provider();
-$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
+$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
+$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
 $style->set_ext_dir_prefix('adm/');
 $style->set_custom_style('admin', '../adm/style', '');
-$template = $style->template;
 $template->assign_var('T_ASSETS_PATH', '../assets');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
 
-- 
cgit v1.2.1


From 1be5bd8e1311a9dd859e6e685cdfa5979adf69a4 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 31 Mar 2012 18:38:37 +0300
Subject: [feature/merging-style-components] Fixing typo in database updater

Fixing typo in database_update.php

PHPBB3-10632
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 18ca4870fb..3235731d28 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2274,7 +2274,7 @@ function change_database_data(&$no_updates, $version)
 					'cat'		=> 'ACP_ATTACHMENTS',
 				),
 				'install'	=> array(
-					'base'		=> 'acp_styles'
+					'base'		=> 'acp_styles',
 					'class'		=> 'acp',
 					'title'		=> 'ACP_STYLES_INSTALL',
 					'auth'		=> 'acl_a_styles',
-- 
cgit v1.2.1


From 550ee7309a1d83711e4b9cf4abe3468807d84996 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 31 Mar 2012 18:53:49 +0300
Subject: [feature/merging-style-components] Fixing typos in database updater

Yes, I failed... again. Fixing 2 more typos in database_update.php

PHPBB3-10632
---
 phpBB/install/database_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 3235731d28..583574a245 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2281,14 +2281,14 @@ function change_database_data(&$no_updates, $version)
 					'cat'		=> 'ACP_STYLE_MANAGEMENT',
 				),
 				'edit'	=> array(
-					'base'		=> 'acp_styles'
+					'base'		=> 'acp_styles',
 					'class'		=> 'acp',
 					'title'		=> 'ACP_STYLES_EDIT',
 					'auth'		=> 'acl_a_styles',
 					'cat'		=> 'ACP_STYLE_MANAGEMENT',
 				),
 				'cache'	=> array(
-					'base'		=> 'acp_styles'
+					'base'		=> 'acp_styles',
 					'class'		=> 'acp',
 					'title'		=> 'ACP_STYLES_CACHE',
 					'auth'		=> 'acl_a_styles',
-- 
cgit v1.2.1


From 6deb7b3671c29ab7ce1db6e11b5c6be0950d265f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 02:50:19 +0200
Subject: [feature/class-prefix] Rename user and session to phpbb_*

PHPBB-10609
---
 phpBB/install/database_update.php | 3 +--
 phpBB/install/index.php           | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 18ca4870fb..fb5e79358d 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -84,7 +84,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-require($phpbb_root_path . 'includes/session.' . $phpEx);
 require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
@@ -122,7 +121,7 @@ $phpbb_class_loader->set_cache($cache->get_driver());
 
 $phpbb_dispatcher = new phpbb_event_dispatcher();
 $request = new phpbb_request();
-$user = new user();
+$user = new phpbb_user();
 $db = new $sql_db();
 
 // make sure request_var uses this request instance
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 6c32a322f8..d3cb68e82e 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -76,7 +76,6 @@ require($phpbb_root_path . 'includes/functions.' . $phpEx);
 phpbb_require_updated('includes/functions_content.' . $phpEx, true);
 
 include($phpbb_root_path . 'includes/auth.' . $phpEx);
-include($phpbb_root_path . 'includes/session.' . $phpEx);
 include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
@@ -178,7 +177,7 @@ $sub = request_var('sub', '');
 // Set PHP error handler to ours
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
-$user = new user();
+$user = new phpbb_user();
 $auth = new auth();
 
 // Add own hook handler, if present. :o
-- 
cgit v1.2.1


From 9236dd4c471a6f7655bd00ae422a13013a400ac4 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 02:54:39 +0200
Subject: [feature/class-prefix] Rename auth => phpbb_auth

PHPBB3-10609
---
 phpBB/install/database_update.php | 1 -
 phpBB/install/index.php           | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index fb5e79358d..96d984c04c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -84,7 +84,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index d3cb68e82e..13ab30a9fa 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -75,7 +75,6 @@ require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
 phpbb_require_updated('includes/functions_content.' . $phpEx, true);
 
-include($phpbb_root_path . 'includes/auth.' . $phpEx);
 include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
@@ -178,7 +177,7 @@ $sub = request_var('sub', '');
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 $user = new phpbb_user();
-$auth = new auth();
+$auth = new phpbb_auth();
 
 // Add own hook handler, if present. :o
 if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))
-- 
cgit v1.2.1


From a7f61b91b7feec80cd9d544502aef937f036ae7c Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 20:45:58 +0200
Subject: [feature/dic] Use DIC in download/file and install/index

PHPBB3-10739
---
 phpBB/install/index.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 13ab30a9fa..36c10c3ca6 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -79,19 +79,27 @@ include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
 
-$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
+$container = new ContainerBuilder();
+$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+$loader->load('parameters.yml');
+$loader->load('services.yml');
+
+$container->setParameter('core.root_path', $phpbb_root_path);
+$container->setParameter('core.php_ext', $phpEx);
+$container->setAlias('cache.driver.install', 'cache.driver');
+
+$phpbb_class_loader_ext = $container->get('class_loader.ext');
 $phpbb_class_loader_ext->register();
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
+$phpbb_class_loader = $container->get('class_loader');
 $phpbb_class_loader->register();
 
 // set up caching
-$cache_factory = new phpbb_cache_factory('file');
-$cache = $cache_factory->get_service();
-$phpbb_class_loader_ext->set_cache($cache->get_driver());
-$phpbb_class_loader->set_cache($cache->get_driver());
+$cache = $container->get('cache');
+$phpbb_class_loader_ext->set_cache($container->get('cache.driver'));
+$phpbb_class_loader->set_cache($container->get('cache.driver'));
 
-$phpbb_dispatcher = new phpbb_event_dispatcher();
-$request = new phpbb_request();
+$phpbb_dispatcher = $container->get('dispatcher');
+$request	= $container->get('request');
 
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
-- 
cgit v1.2.1


From dc9ccc432cd0b24cf762f8285d8a90f52b8efe5b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 21:20:58 +0200
Subject: [feature/dic] Make use of calls to cut down on boilerplate

PHPBB3-10739
---
 phpBB/install/index.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 36c10c3ca6..0d7a0a288c 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -88,15 +88,11 @@ $container->setParameter('core.root_path', $phpbb_root_path);
 $container->setParameter('core.php_ext', $phpEx);
 $container->setAlias('cache.driver.install', 'cache.driver');
 
-$phpbb_class_loader_ext = $container->get('class_loader.ext');
-$phpbb_class_loader_ext->register();
 $phpbb_class_loader = $container->get('class_loader');
-$phpbb_class_loader->register();
+$phpbb_class_loader_ext = $container->get('class_loader.ext');
 
 // set up caching
 $cache = $container->get('cache');
-$phpbb_class_loader_ext->set_cache($container->get('cache.driver'));
-$phpbb_class_loader->set_cache($container->get('cache.driver'));
 
 $phpbb_dispatcher = $container->get('dispatcher');
 $request	= $container->get('request');
-- 
cgit v1.2.1


From 57065095d570f0ff5976470ce81a4b216fe5f98e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 00:41:56 +0300
Subject: [ticket/10754] Changing $style to $phpbb_style

Renaming global variable $style to $phpbb_style

PHPBB3-10754
---
 phpBB/install/index.php          | 6 +++---
 phpBB/install/install_update.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 13ab30a9fa..bb10521bba 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -203,9 +203,9 @@ $config = new phpbb_config(array(
 $phpbb_style_resource_locator = new phpbb_style_resource_locator();
 $phpbb_style_path_provider = new phpbb_style_path_provider();
 $template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
-$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
-$style->set_ext_dir_prefix('adm/');
-$style->set_custom_style('admin', '../adm/style', '');
+$phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
+$phpbb_style->set_ext_dir_prefix('adm/');
+$phpbb_style->set_custom_style('admin', '../adm/style', '');
 $template->assign_var('T_ASSETS_PATH', '../assets');
 $template->assign_var('T_TEMPLATE_PATH', '../adm/style');
 
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index dcf01e5cc8..c2feaa086a 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -131,7 +131,7 @@ class install_update extends module
 		}
 
 		// Set custom template again. ;)
-		$style->set_custom_style('admin', '../adm/style', '');
+		$phpbb_style->set_custom_style('admin', '../adm/style', '');
 
 		$template->assign_vars(array(
 			'S_USER_LANG'			=> $user->lang['USER_LANG'],
-- 
cgit v1.2.1


From f32547c2150a3e6201edf0f856a93229040c73be Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sat, 24 Mar 2012 12:57:28 +0530
Subject: [ticket/10650] Displaying last topic on forum list

The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
---
 phpBB/install/database_update.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a84136388c..509e991c81 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1084,6 +1084,9 @@ function database_update_info()
 				GROUPS_TABLE		=> array(
 					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
 				),
+				FORUMS_TABLE		=> array(
+					'display_last_subject'	=> array('BOOL', 1),
+				),
 				PROFILE_FIELDS_TABLE	=> array(
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
-- 
cgit v1.2.1


From fd409c49a5daac5cc0b055798ce9b601525b11a4 Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sun, 25 Mar 2012 01:39:34 +0530
Subject: [ticket/10650] Added static sql files

Ran create_schema_files.php and added
the generated static sql files to the commit.

PHPBB3-10650
---
 phpBB/install/schemas/firebird_schema.sql | 1 +
 phpBB/install/schemas/mssql_schema.sql    | 1 +
 phpBB/install/schemas/mysql_40_schema.sql | 1 +
 phpBB/install/schemas/mysql_41_schema.sql | 1 +
 phpBB/install/schemas/oracle_schema.sql   | 1 +
 phpBB/install/schemas/postgres_schema.sql | 1 +
 phpBB/install/schemas/sqlite_schema.sql   | 1 +
 7 files changed, 7 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 51565ef2d4..950362e746 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -376,6 +376,7 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER DEFAULT 0 NOT NULL,
 	display_subforum_list INTEGER DEFAULT 1 NOT NULL,
 	display_on_index INTEGER DEFAULT 1 NOT NULL,
+	display_last_subject INTEGER DEFAULT 1 NOT NULL,
 	enable_indexing INTEGER DEFAULT 1 NOT NULL,
 	enable_icons INTEGER DEFAULT 1 NOT NULL,
 	enable_prune INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 2c78dd009f..90a9563760 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -455,6 +455,7 @@ CREATE TABLE [phpbb_forums] (
 	[forum_options] [int] DEFAULT (0) NOT NULL ,
 	[display_subforum_list] [int] DEFAULT (1) NOT NULL ,
 	[display_on_index] [int] DEFAULT (1) NOT NULL ,
+	[display_last_subject] [int] DEFAULT (1) NOT NULL ,
 	[enable_indexing] [int] DEFAULT (1) NOT NULL ,
 	[enable_icons] [int] DEFAULT (1) NOT NULL ,
 	[enable_prune] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index d19f1930d0..7f7225463d 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -262,6 +262,7 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 3fd8d4f1d1..cd23c6ec86 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -262,6 +262,7 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8a0f3e56b1..0fe1eb9acb 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -522,6 +522,7 @@ CREATE TABLE phpbb_forums (
 	forum_options number(20) DEFAULT '0' NOT NULL,
 	display_subforum_list number(1) DEFAULT '1' NOT NULL,
 	display_on_index number(1) DEFAULT '1' NOT NULL,
+	display_last_subject number(1) DEFAULT '1' NOT NULL,
 	enable_indexing number(1) DEFAULT '1' NOT NULL,
 	enable_icons number(1) DEFAULT '1' NOT NULL,
 	enable_prune number(1) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index c624024362..91e5629791 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -398,6 +398,7 @@ CREATE TABLE phpbb_forums (
 	forum_options INT4 DEFAULT '0' NOT NULL CHECK (forum_options >= 0),
 	display_subforum_list INT2 DEFAULT '1' NOT NULL CHECK (display_subforum_list >= 0),
 	display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0),
+	display_last_subject INT2 DEFAULT '1' NOT NULL CHECK (display_last_subject >= 0),
 	enable_indexing INT2 DEFAULT '1' NOT NULL CHECK (enable_indexing >= 0),
 	enable_icons INT2 DEFAULT '1' NOT NULL CHECK (enable_icons >= 0),
 	enable_prune INT2 DEFAULT '0' NOT NULL CHECK (enable_prune >= 0),
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index bd002c93ed..090ae0911b 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -255,6 +255,7 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	display_subforum_list INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	display_last_subject INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_indexing INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_icons INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_prune INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
cgit v1.2.1


From 98964a913cb22761553d04170aa4830e324f7488 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 4 Apr 2012 18:28:36 -0400
Subject: [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop

The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
---
 phpBB/install/database_update.php         | 3 ---
 phpBB/install/schemas/firebird_schema.sql | 1 -
 phpBB/install/schemas/mssql_schema.sql    | 1 -
 phpBB/install/schemas/mysql_40_schema.sql | 1 -
 phpBB/install/schemas/mysql_41_schema.sql | 1 -
 phpBB/install/schemas/oracle_schema.sql   | 1 -
 phpBB/install/schemas/postgres_schema.sql | 1 -
 phpBB/install/schemas/sqlite_schema.sql   | 1 -
 8 files changed, 10 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 509e991c81..a84136388c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1084,9 +1084,6 @@ function database_update_info()
 				GROUPS_TABLE		=> array(
 					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
 				),
-				FORUMS_TABLE		=> array(
-					'display_last_subject'	=> array('BOOL', 1),
-				),
 				PROFILE_FIELDS_TABLE	=> array(
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 950362e746..51565ef2d4 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -376,7 +376,6 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER DEFAULT 0 NOT NULL,
 	display_subforum_list INTEGER DEFAULT 1 NOT NULL,
 	display_on_index INTEGER DEFAULT 1 NOT NULL,
-	display_last_subject INTEGER DEFAULT 1 NOT NULL,
 	enable_indexing INTEGER DEFAULT 1 NOT NULL,
 	enable_icons INTEGER DEFAULT 1 NOT NULL,
 	enable_prune INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 90a9563760..2c78dd009f 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -455,7 +455,6 @@ CREATE TABLE [phpbb_forums] (
 	[forum_options] [int] DEFAULT (0) NOT NULL ,
 	[display_subforum_list] [int] DEFAULT (1) NOT NULL ,
 	[display_on_index] [int] DEFAULT (1) NOT NULL ,
-	[display_last_subject] [int] DEFAULT (1) NOT NULL ,
 	[enable_indexing] [int] DEFAULT (1) NOT NULL ,
 	[enable_icons] [int] DEFAULT (1) NOT NULL ,
 	[enable_prune] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 7f7225463d..d19f1930d0 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -262,7 +262,6 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index cd23c6ec86..3fd8d4f1d1 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -262,7 +262,6 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 0fe1eb9acb..8a0f3e56b1 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -522,7 +522,6 @@ CREATE TABLE phpbb_forums (
 	forum_options number(20) DEFAULT '0' NOT NULL,
 	display_subforum_list number(1) DEFAULT '1' NOT NULL,
 	display_on_index number(1) DEFAULT '1' NOT NULL,
-	display_last_subject number(1) DEFAULT '1' NOT NULL,
 	enable_indexing number(1) DEFAULT '1' NOT NULL,
 	enable_icons number(1) DEFAULT '1' NOT NULL,
 	enable_prune number(1) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 91e5629791..c624024362 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -398,7 +398,6 @@ CREATE TABLE phpbb_forums (
 	forum_options INT4 DEFAULT '0' NOT NULL CHECK (forum_options >= 0),
 	display_subforum_list INT2 DEFAULT '1' NOT NULL CHECK (display_subforum_list >= 0),
 	display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0),
-	display_last_subject INT2 DEFAULT '1' NOT NULL CHECK (display_last_subject >= 0),
 	enable_indexing INT2 DEFAULT '1' NOT NULL CHECK (enable_indexing >= 0),
 	enable_icons INT2 DEFAULT '1' NOT NULL CHECK (enable_icons >= 0),
 	enable_prune INT2 DEFAULT '0' NOT NULL CHECK (enable_prune >= 0),
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 090ae0911b..bd002c93ed 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -255,7 +255,6 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	display_subforum_list INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1',
-	display_last_subject INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_indexing INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_icons INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_prune INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
cgit v1.2.1


From 1c9993055a563cab323b03f15d2d3bc1ae696b0b Mon Sep 17 00:00:00 2001
From: Gabriel Anca <gabrielanca@phpbb.com>
Date: Thu, 22 Mar 2012 19:03:07 +0100
Subject: [ticket/10547] User is not logged in as admin after installation

After installing, when user clicks Login button (final installation step),
he is not logged in because there's a missing var ($data)

PHPBB3-10547
---
 phpBB/install/install_install.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 361376763d..7558fde944 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1804,6 +1804,9 @@ class install_install extends module
 
 		$this->page_title = $lang['STAGE_FINAL'];
 
+		// Obtain any submitted data
+		$data = $this->get_submitted_data();
+
 		// We need to fill the config to let internal functions correctly work
 		$config = new phpbb_config_db($db, new phpbb_cache_driver_null, CONFIG_TABLE);
 		set_config(null, null, null, $config);
-- 
cgit v1.2.1


From 03e382f99c61c12655998ac8bd798fca7a34c099 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 5 Apr 2012 17:34:37 -0400
Subject: [ticket/10605] Fix syntax error in database updater.

PHPBB3-10605
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b6298ca651..6088a58fc4 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2041,7 +2041,7 @@ function change_database_data(&$no_updates, $version)
 						'ON'	=> 'p.msg_id = t.msg_id',
 					),
 				),
-				'WHERE'		=> 't.user_id IS NULL';
+				'WHERE'		=> 't.user_id IS NULL');
 			$sql = $db->sql_build_query('SELECT', $sql_array);
 
 			do
-- 
cgit v1.2.1


From de1e343c5b408da09448b3150cfec2de75afd04a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 5 Apr 2012 17:34:54 -0400
Subject: [ticket/10605] Add a section for updating from 3.0.10 to schema
 updates.

Without it data updates do not appear to be run.

PHPBB3-10605
---
 phpBB/install/database_update.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 6088a58fc4..116e6ea9a6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -993,6 +993,8 @@ function database_update_info()
 		'3.0.10-RC2'	=> array(),
 		// No changes from 3.0.10-RC3 to 3.0.10
 		'3.0.10-RC3'	=> array(),
+		// No changes from 3.0.10 to 3.0.11-RC1
+		'3.0.10'		=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
-- 
cgit v1.2.1


From 2b2286a46c56b8a9e5444fd06eff263f880e0c78 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 5 Apr 2012 17:35:27 -0400
Subject: [ticket/10605] Fix left join usage.

Previously this produced broken SQL:

SELECT p.msg_id FROM phpbb_privmsgs p
LEFT JOIN 0 phpbb_privmsgs_to ON (p.msg_id = t.msg_id)
WHERE t.user_id IS NULL LIMIT 500 OFFSET 0

PHPBB3-10605
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 116e6ea9a6..0737061887 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2039,7 +2039,7 @@ function change_database_data(&$no_updates, $version)
 				),
 				'LEFT_JOIN'	=> array(
 					array(
-						'FROM'	=> array(PRIVMSGS_TO_TABLE, 't'),
+						'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
 						'ON'	=> 'p.msg_id = t.msg_id',
 					),
 				),
-- 
cgit v1.2.1


From ea5ae09c7d899bd0daa2b8b18371d6c4fbba4c5e Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Fri, 6 Apr 2012 14:09:56 +0530
Subject: [ticket/10561] Added section in database_update.php

Added section to check for existing users using a
deactivated style, and revert it to default style.

PHPBB3-10561
---
 phpBB/install/database_update.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a1b7dcd47f..91016273e6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1871,6 +1871,24 @@ function change_database_data(&$no_updates, $version)
 			}
 			// end Bing Bot addition
 
+			// Updates users having current style a deactivated one
+			$sql = 'SELECT style_id
+					FROM ' . STYLES_TABLE . '
+					WHERE style_active = 0';
+			$result = $db->sql_query($sql);
+
+			while($temp = $db->sql_fetchfield('style_id', false, $result))
+			{
+				$styles[] = $temp;
+			}
+
+			$db->sql_freeresult($result);
+			$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_style = ' . $config['default_style'] .'
+					WHERE ' . $db->sql_in_set('user_style', $styles);
+			$result = $db->sql_query($sql);
+			$db->sql_freeresult($result);
+
 			// Delete shadow topics pointing to not existing topics
 			$batch_size = 500;
 
-- 
cgit v1.2.1


From 1808a61fe3e89399aec4ecced36e270faa7d0beb Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Sat, 7 Apr 2012 19:42:42 +0530
Subject: [ticket/10561] Added to database_update:database_update_info()

Updates made to database_update.php

PHPBB3-10561
---
 phpBB/install/database_update.php | 45 +++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 18 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 91016273e6..096d90219b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -993,6 +993,8 @@ function database_update_info()
 		'3.0.10-RC2'	=> array(),
 		// No changes from 3.0.10-RC3 to 3.0.10
 		'3.0.10-RC3'	=> array(),
+		// No changes from 3.0.10 to 3.0.11-RC1
+		'3.0.10'		=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
@@ -1871,24 +1873,6 @@ function change_database_data(&$no_updates, $version)
 			}
 			// end Bing Bot addition
 
-			// Updates users having current style a deactivated one
-			$sql = 'SELECT style_id
-					FROM ' . STYLES_TABLE . '
-					WHERE style_active = 0';
-			$result = $db->sql_query($sql);
-
-			while($temp = $db->sql_fetchfield('style_id', false, $result))
-			{
-				$styles[] = $temp;
-			}
-
-			$db->sql_freeresult($result);
-			$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_style = ' . $config['default_style'] .'
-					WHERE ' . $db->sql_in_set('user_style', $styles);
-			$result = $db->sql_query($sql);
-			$db->sql_freeresult($result);
-
 			// Delete shadow topics pointing to not existing topics
 			$batch_size = 500;
 
@@ -2042,6 +2026,31 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.10-RC3 to 3.0.10
 		case '3.0.10-RC3':
 		break;
+		
+		// Changes from 3.0.10 to 3.0.11-RC1
+		case '3.0.10':
+			// Updates users having current style a deactivated one
+			$deactivated_style_ids = array();
+			$sql = 'SELECT style_id
+					FROM ' . STYLES_TABLE . '
+					WHERE style_active = 0';
+			$result = $db->sql_query($sql);
+
+			while ($temp_style_id = $db->sql_fetchfield('style_id', false, $result))
+			{
+				$deactivated_style_ids[] = (int) $temp_style_id;
+			}
+
+			$db->sql_freeresult($result);
+			if (!empty($deactivated_style_ids))
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+						SET user_style = ' . $config['default_style'] .'
+						WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
+				$result = $db->sql_query($sql);
+			}
+			$no_updates = false;
+		break;
 	}
 }
 
-- 
cgit v1.2.1


From 03a35581c4b0dcb7c20885d4ca807ea7117872cb Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Sat, 7 Apr 2012 23:15:12 +0530
Subject: [ticket/10561] Reverted to phpbb_style_is_active()

Changes made to function name, reverted to old.

PHPBB3-10561
---
 phpBB/install/database_update.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 096d90219b..8f00b18846 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2030,18 +2030,18 @@ function change_database_data(&$no_updates, $version)
 		// Changes from 3.0.10 to 3.0.11-RC1
 		case '3.0.10':
 			// Updates users having current style a deactivated one
-			$deactivated_style_ids = array();
 			$sql = 'SELECT style_id
 					FROM ' . STYLES_TABLE . '
 					WHERE style_active = 0';
 			$result = $db->sql_query($sql);
 
+			$deactivated_style_ids = array();
 			while ($temp_style_id = $db->sql_fetchfield('style_id', false, $result))
 			{
 				$deactivated_style_ids[] = (int) $temp_style_id;
 			}
-
 			$db->sql_freeresult($result);
+
 			if (!empty($deactivated_style_ids))
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
@@ -2049,6 +2049,7 @@ function change_database_data(&$no_updates, $version)
 						WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
 				$result = $db->sql_query($sql);
 			}
+
 			$no_updates = false;
 		break;
 	}
-- 
cgit v1.2.1


From 9b30bd639201ffbbf1d1b3ae32fda7e75d3253dd Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sat, 24 Mar 2012 12:57:28 +0530
Subject: [ticket/10650] Displaying last topic on forum list

The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
---
 phpBB/install/database_update.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a84136388c..509e991c81 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1084,6 +1084,9 @@ function database_update_info()
 				GROUPS_TABLE		=> array(
 					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
 				),
+				FORUMS_TABLE		=> array(
+					'display_last_subject'	=> array('BOOL', 1),
+				),
 				PROFILE_FIELDS_TABLE	=> array(
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
-- 
cgit v1.2.1


From 668e47721c3566667c07c6892dcd2d55012e43b3 Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sun, 25 Mar 2012 01:39:34 +0530
Subject: [ticket/10650] Added static sql files

Ran create_schema_files.php and added
the generated static sql files to the commit.

PHPBB3-10650
---
 phpBB/install/schemas/firebird_schema.sql | 1 +
 phpBB/install/schemas/mssql_schema.sql    | 1 +
 phpBB/install/schemas/mysql_40_schema.sql | 1 +
 phpBB/install/schemas/mysql_41_schema.sql | 1 +
 phpBB/install/schemas/oracle_schema.sql   | 1 +
 phpBB/install/schemas/postgres_schema.sql | 1 +
 phpBB/install/schemas/sqlite_schema.sql   | 1 +
 7 files changed, 7 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 51565ef2d4..950362e746 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -376,6 +376,7 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER DEFAULT 0 NOT NULL,
 	display_subforum_list INTEGER DEFAULT 1 NOT NULL,
 	display_on_index INTEGER DEFAULT 1 NOT NULL,
+	display_last_subject INTEGER DEFAULT 1 NOT NULL,
 	enable_indexing INTEGER DEFAULT 1 NOT NULL,
 	enable_icons INTEGER DEFAULT 1 NOT NULL,
 	enable_prune INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 2c78dd009f..90a9563760 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -455,6 +455,7 @@ CREATE TABLE [phpbb_forums] (
 	[forum_options] [int] DEFAULT (0) NOT NULL ,
 	[display_subforum_list] [int] DEFAULT (1) NOT NULL ,
 	[display_on_index] [int] DEFAULT (1) NOT NULL ,
+	[display_last_subject] [int] DEFAULT (1) NOT NULL ,
 	[enable_indexing] [int] DEFAULT (1) NOT NULL ,
 	[enable_icons] [int] DEFAULT (1) NOT NULL ,
 	[enable_prune] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index d19f1930d0..7f7225463d 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -262,6 +262,7 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 3fd8d4f1d1..cd23c6ec86 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -262,6 +262,7 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8a0f3e56b1..0fe1eb9acb 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -522,6 +522,7 @@ CREATE TABLE phpbb_forums (
 	forum_options number(20) DEFAULT '0' NOT NULL,
 	display_subforum_list number(1) DEFAULT '1' NOT NULL,
 	display_on_index number(1) DEFAULT '1' NOT NULL,
+	display_last_subject number(1) DEFAULT '1' NOT NULL,
 	enable_indexing number(1) DEFAULT '1' NOT NULL,
 	enable_icons number(1) DEFAULT '1' NOT NULL,
 	enable_prune number(1) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index c624024362..91e5629791 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -398,6 +398,7 @@ CREATE TABLE phpbb_forums (
 	forum_options INT4 DEFAULT '0' NOT NULL CHECK (forum_options >= 0),
 	display_subforum_list INT2 DEFAULT '1' NOT NULL CHECK (display_subforum_list >= 0),
 	display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0),
+	display_last_subject INT2 DEFAULT '1' NOT NULL CHECK (display_last_subject >= 0),
 	enable_indexing INT2 DEFAULT '1' NOT NULL CHECK (enable_indexing >= 0),
 	enable_icons INT2 DEFAULT '1' NOT NULL CHECK (enable_icons >= 0),
 	enable_prune INT2 DEFAULT '0' NOT NULL CHECK (enable_prune >= 0),
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index bd002c93ed..090ae0911b 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -255,6 +255,7 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	display_subforum_list INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	display_last_subject INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_indexing INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_icons INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_prune INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
cgit v1.2.1


From c524236ef6d84f6ef78f684aeb7bb469ca844db4 Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Fri, 6 Apr 2012 01:07:23 +0530
Subject: [ticket/10650] Changed acp option from per forum to global

Changed the display last subject acp toggle option from
per forum to global. Modified associated database entries.
New option is available in ACP General->Board Features.
Also corrected <br /> in forumlist_body.html.

PHPBB3-10650
---
 phpBB/install/database_update.php         | 10 +++++++---
 phpBB/install/schemas/firebird_schema.sql |  1 -
 phpBB/install/schemas/mssql_schema.sql    |  1 -
 phpBB/install/schemas/mysql_40_schema.sql |  1 -
 phpBB/install/schemas/mysql_41_schema.sql |  1 -
 phpBB/install/schemas/oracle_schema.sql   |  1 -
 phpBB/install/schemas/postgres_schema.sql |  1 -
 phpBB/install/schemas/sqlite_schema.sql   |  1 -
 8 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 509e991c81..89b252e3fa 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1084,9 +1084,6 @@ function database_update_info()
 				GROUPS_TABLE		=> array(
 					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
 				),
-				FORUMS_TABLE		=> array(
-					'display_last_subject'	=> array('BOOL', 1),
-				),
 				PROFILE_FIELDS_TABLE	=> array(
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
@@ -2397,8 +2394,15 @@ function change_database_data(&$no_updates, $version)
 			$sql = 'INSERT INTO ' . STYLES_TABLE . " (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '&copy; phpBB Group', 1, 'prosilver', 'kNg=', 0, '')";
 			_sql($sql, $errored, $error_ary);
 			
+			//Create config value for displaying last subject on forum list
+			if(!isset($config['display_last_subject']))
+			{			
+				$config->set("display_last_subject", '1');
+			}
+			
 			$no_updates = false;
 
 		break;
 	}
 }
+
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 950362e746..51565ef2d4 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -376,7 +376,6 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER DEFAULT 0 NOT NULL,
 	display_subforum_list INTEGER DEFAULT 1 NOT NULL,
 	display_on_index INTEGER DEFAULT 1 NOT NULL,
-	display_last_subject INTEGER DEFAULT 1 NOT NULL,
 	enable_indexing INTEGER DEFAULT 1 NOT NULL,
 	enable_icons INTEGER DEFAULT 1 NOT NULL,
 	enable_prune INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 90a9563760..2c78dd009f 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -455,7 +455,6 @@ CREATE TABLE [phpbb_forums] (
 	[forum_options] [int] DEFAULT (0) NOT NULL ,
 	[display_subforum_list] [int] DEFAULT (1) NOT NULL ,
 	[display_on_index] [int] DEFAULT (1) NOT NULL ,
-	[display_last_subject] [int] DEFAULT (1) NOT NULL ,
 	[enable_indexing] [int] DEFAULT (1) NOT NULL ,
 	[enable_icons] [int] DEFAULT (1) NOT NULL ,
 	[enable_prune] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 7f7225463d..d19f1930d0 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -262,7 +262,6 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index cd23c6ec86..3fd8d4f1d1 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -262,7 +262,6 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 0fe1eb9acb..8a0f3e56b1 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -522,7 +522,6 @@ CREATE TABLE phpbb_forums (
 	forum_options number(20) DEFAULT '0' NOT NULL,
 	display_subforum_list number(1) DEFAULT '1' NOT NULL,
 	display_on_index number(1) DEFAULT '1' NOT NULL,
-	display_last_subject number(1) DEFAULT '1' NOT NULL,
 	enable_indexing number(1) DEFAULT '1' NOT NULL,
 	enable_icons number(1) DEFAULT '1' NOT NULL,
 	enable_prune number(1) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 91e5629791..c624024362 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -398,7 +398,6 @@ CREATE TABLE phpbb_forums (
 	forum_options INT4 DEFAULT '0' NOT NULL CHECK (forum_options >= 0),
 	display_subforum_list INT2 DEFAULT '1' NOT NULL CHECK (display_subforum_list >= 0),
 	display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0),
-	display_last_subject INT2 DEFAULT '1' NOT NULL CHECK (display_last_subject >= 0),
 	enable_indexing INT2 DEFAULT '1' NOT NULL CHECK (enable_indexing >= 0),
 	enable_icons INT2 DEFAULT '1' NOT NULL CHECK (enable_icons >= 0),
 	enable_prune INT2 DEFAULT '0' NOT NULL CHECK (enable_prune >= 0),
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 090ae0911b..bd002c93ed 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -255,7 +255,6 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	display_subforum_list INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1',
-	display_last_subject INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_indexing INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_icons INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_prune INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
cgit v1.2.1


From b6957aa5252544fe0b52af94e35bc93b47e3518e Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Fri, 6 Apr 2012 01:15:12 +0530
Subject: [ticket/10650]Removed incorrect newline

Deleted additional line in the end of database_update.php

PHPBB3-10650
---
 phpBB/install/database_update.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 89b252e3fa..4f5fe142c9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2405,4 +2405,3 @@ function change_database_data(&$no_updates, $version)
 		break;
 	}
 }
-
-- 
cgit v1.2.1


From 4e630ef1601ef39c7947de7d071fdccf68f52e3b Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 9 Apr 2012 00:33:55 +0530
Subject: [ticket/10561] Casted $config['default_style'] to int

PHPBB3-10561
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 8f00b18846..576b3c0ba8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2045,7 +2045,7 @@ function change_database_data(&$no_updates, $version)
 			if (!empty($deactivated_style_ids))
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_style = ' . $config['default_style'] .'
+						SET user_style = ' . (int) $config['default_style'] .'
 						WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
 				$result = $db->sql_query($sql);
 			}
-- 
cgit v1.2.1


From 8442b19e59e3d07129c3ef5286ada84a3ac64b98 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 9 Apr 2012 01:04:17 +0530
Subject: [ticket/10561] Changed $temp_style_id to $style_id

PHPBB3-10561
---
 phpBB/install/database_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 576b3c0ba8..ba89a07e92 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2036,9 +2036,9 @@ function change_database_data(&$no_updates, $version)
 			$result = $db->sql_query($sql);
 
 			$deactivated_style_ids = array();
-			while ($temp_style_id = $db->sql_fetchfield('style_id', false, $result))
+			while ($style_id = $db->sql_fetchfield('style_id', false, $result))
 			{
-				$deactivated_style_ids[] = (int) $temp_style_id;
+				$deactivated_style_ids[] = (int) $style_id;
 			}
 			$db->sql_freeresult($result);
 
-- 
cgit v1.2.1


From 2a48284fc9125edad2dbd9de41dfb1ef61926b6b Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 9 Apr 2012 01:25:17 +0530
Subject: [ticket/10561] Removed extra tabs, changes made to $db->sql_query()

Substituted $db->sql_query() with _sql()

PHPBB3-10561
---
 phpBB/install/database_update.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index ba89a07e92..6097341ace 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2031,8 +2031,8 @@ function change_database_data(&$no_updates, $version)
 		case '3.0.10':
 			// Updates users having current style a deactivated one
 			$sql = 'SELECT style_id
-					FROM ' . STYLES_TABLE . '
-					WHERE style_active = 0';
+				FROM ' . STYLES_TABLE . '
+				WHERE style_active = 0';
 			$result = $db->sql_query($sql);
 
 			$deactivated_style_ids = array();
@@ -2045,9 +2045,9 @@ function change_database_data(&$no_updates, $version)
 			if (!empty($deactivated_style_ids))
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_style = ' . (int) $config['default_style'] .'
-						WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
-				$result = $db->sql_query($sql);
+					SET user_style = ' . (int) $config['default_style'] .'
+					WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
+				_sql($sql, $errored, $error_ary);
 			}
 
 			$no_updates = false;
-- 
cgit v1.2.1


From 303748b02db2aa76391f60770c292edf45cee360 Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Mon, 9 Apr 2012 01:43:44 +0530
Subject: [ticket/10650] Added space after if and comment

Added space in proper places in database_update.php. Also
corrected language entry of ELLIPSIS to utf8

PHPBB3-10650
---
 phpBB/install/database_update.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4f5fe142c9..5c70a07f1e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2394,10 +2394,10 @@ function change_database_data(&$no_updates, $version)
 			$sql = 'INSERT INTO ' . STYLES_TABLE . " (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '&copy; phpBB Group', 1, 'prosilver', 'kNg=', 0, '')";
 			_sql($sql, $errored, $error_ary);
 			
-			//Create config value for displaying last subject on forum list
-			if(!isset($config['display_last_subject']))
+			// Create config value for displaying last subject on forum list
+			if (!isset($config['display_last_subject']))
 			{			
-				$config->set("display_last_subject", '1');
+				$config->set('display_last_subject', '1');
 			}
 			
 			$no_updates = false;
-- 
cgit v1.2.1


From 2e76620c8824da62f97cfdaee8f9b1014159fd7c Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 9 Apr 2012 00:22:55 +0200
Subject: [feature/dic] Rewrite cron system to use DIC

PHPBB3-10739
---
 phpBB/install/index.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 0d7a0a288c..dd84e2d519 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -79,23 +79,24 @@ include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
 
-$container = new ContainerBuilder();
-$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+$phpbb_container = new ContainerBuilder();
+$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config'));
 $loader->load('parameters.yml');
 $loader->load('services.yml');
 
-$container->setParameter('core.root_path', $phpbb_root_path);
-$container->setParameter('core.php_ext', $phpEx);
-$container->setAlias('cache.driver.install', 'cache.driver');
+$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
+$phpbb_container->setParameter('core.php_ext', $phpEx);
+$phpbb_container->setAlias('cache.driver.install', 'cache.driver');
+$phpbb_container->set('container', $phpbb_container);
 
-$phpbb_class_loader = $container->get('class_loader');
-$phpbb_class_loader_ext = $container->get('class_loader.ext');
+$phpbb_class_loader = $phpbb_container->get('class_loader');
+$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
 // set up caching
-$cache = $container->get('cache');
+$cache = $phpbb_container->get('cache');
 
-$phpbb_dispatcher = $container->get('dispatcher');
-$request	= $container->get('request');
+$phpbb_dispatcher = $phpbb_container->get('dispatcher');
+$request	= $phpbb_container->get('request');
 
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
-- 
cgit v1.2.1


From 394a95b5c5c048e9c606f5fc05e512ddc40e5ded Mon Sep 17 00:00:00 2001
From: Shibu Lijack <shibulijack@gmail.com>
Date: Wed, 11 Apr 2012 17:54:50 +0530
Subject: [ticket/10688] Updated version to 3.1

Replace phpBB 3.0.x to phpBB 3.1.x

PHPBB-10688
---
 phpBB/install/convertors/functions_phpbb20.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index aea6074637..0b6daeef47 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -13,7 +13,7 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Helper functions for phpBB 2.0.x to phpBB 3.0.x conversion
+* Helper functions for phpBB 2.0.x to phpBB 3.1.x conversion
 */
 
 /**
-- 
cgit v1.2.1


From 5665e82616fd12fbec36e7a1d42713a75ed85e22 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 11 Apr 2012 14:28:12 +0100
Subject: [ticket/10783] Added ?assets_version to assets.

PHPBB3-10783
---
 phpBB/install/database_update.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index be39b12d12..5368ec06bb 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -189,6 +189,12 @@ $config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE);
 set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 
+// Update asset_version
+if (isset($config['assets_version']))
+{
+	set_config('assets_version', $config['assets_version'] + 1);
+}
+
 // phpbb_db_tools will be taken from new files (under install/update/new)
 // if possible, falling back to the board's copy.
 $db_tools = new phpbb_db_tools($db, true);
@@ -2424,6 +2430,11 @@ function change_database_data(&$no_updates, $version)
 			
 			$no_updates = false;
 
+			if (!isset($config['assets_version']))
+			{
+				$config->set('assets_version', '1');
+			}
+
 		break;
 	}
 }
-- 
cgit v1.2.1


From 7a4b4c7599f3203664350158e36e666a59ca9de2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 13 Apr 2012 16:31:49 +0200
Subject: [ticket/10094] Purge acm_file cache before phpBB installation.

PHPBB3-10094
---
 phpBB/install/install_install.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 026fc0d404..08d072c522 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -53,11 +53,13 @@ class install_install extends module
 
 	function main($mode, $sub)
 	{
-		global $lang, $template, $language, $phpbb_root_path;
+		global $lang, $template, $language, $phpbb_root_path, $cache;
 
 		switch ($sub)
 		{
 			case 'intro':
+				$cache->purge();
+
 				$this->page_title = $lang['SUB_INTRO'];
 
 				$template->assign_vars(array(
-- 
cgit v1.2.1


From b3e42635ca201eea2fa82fb057f021768daf6786 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 10 Apr 2012 22:41:59 +0300
Subject: [ticket/10759] Fixing style in database updater

Fixing error in database updater caused by style components merge

PHPBB3-10759
---
 phpBB/install/database_update.php | 155 +++++++++++++++++++++++++++++++-------
 1 file changed, 127 insertions(+), 28 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 5368ec06bb..0b33168496 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1110,20 +1110,6 @@ function database_update_info()
 					'group_legend'		=> array('UINT', 0),
 				),
 			),
-			'drop_columns'      => array(
-			    STYLES_TABLE		    => array(
-			        'imageset_id',
-			        'template_id',
-			        'theme_id',
-                ),
-            ),
-            'drop_tables'       => array(
-                STYLES_IMAGESET_TABLE,
-                STYLES_IMAGESET_DATA_TABLE,
-                STYLES_TEMPLATE_TABLE,
-                STYLES_TEMPLATE_DATA_TABLE,
-                STYLES_THEME_TABLE,
-            ),
 		),
 	);
 }
@@ -1135,7 +1121,7 @@ function database_update_info()
 *****************************************************************************/
 function change_database_data(&$no_updates, $version)
 {
-	global $db, $errored, $error_ary, $config, $phpbb_root_path, $phpEx;
+	global $db, $errored, $error_ary, $config, $phpbb_root_path, $phpEx, $db_tools;
 
 	switch ($version)
 	{
@@ -2312,13 +2298,6 @@ function change_database_data(&$no_updates, $version)
 					'auth'		=> 'acl_a_styles',
 					'cat'		=> 'ACP_STYLE_MANAGEMENT',
 				),
-				'edit'	=> array(
-					'base'		=> 'acp_styles',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_STYLES_EDIT',
-					'auth'		=> 'acl_a_styles',
-					'cat'		=> 'ACP_STYLE_MANAGEMENT',
-				),
 				'cache'	=> array(
 					'base'		=> 'acp_styles',
 					'class'		=> 'acp',
@@ -2421,13 +2400,133 @@ function change_database_data(&$no_updates, $version)
 			{
 				set_config('teampage_memberships', '1');
 			}
-			
-			// Clear styles table and add prosilver entry
-			_sql('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
 
-			$sql = 'INSERT INTO ' . STYLES_TABLE . " (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '&copy; phpBB Group', 1, 'prosilver', 'kNg=', 0, '')";
-			_sql($sql, $errored, $error_ary);
-			
+			// Check if styles table was already updated
+			if ($db_tools->sql_table_exists(STYLES_THEME_TABLE))
+			{
+				// Get list of valid installed styles
+				$available_styles = array('prosilver');
+
+				$iterator = new DirectoryIterator($phpbb_root_path . 'styles');
+				$skip_dirs = array('.', '..', 'prosilver');
+				foreach ($iterator as $fileinfo)
+				{
+					if ($fileinfo->isDir() && !in_array($fileinfo->getFilename(), $skip_dirs) && file_exists($fileinfo->getPathname() . '/style.cfg'))
+					{
+						$style_cfg = parse_cfg_file($fileinfo->getPathname() . '/style.cfg');
+						if (isset($style_cfg['phpbb_version']) && version_compare($style_cfg['phpbb_version'], '3.1.0-dev', '>='))
+						{
+							// 3.1 style
+							$available_styles[] = $fileinfo->getFilename();
+						}
+					}
+				}
+
+				// Get all installed styles
+				if ($db_tools->sql_table_exists(STYLES_IMAGESET_TABLE))
+				{
+					$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path, i.imageset_id
+						FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
+						WHERE t.template_id = s.template_id
+							AND c.theme_id = s.theme_id
+							AND i.imageset_id = s.imageset_id";
+				}
+				else
+				{
+					$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id
+						FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . " c
+						WHERE t.template_id = s.template_id
+							AND c.theme_id = s.theme_id";
+				}
+				$result = $db->sql_query($sql);
+
+				$styles = array();
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$styles[] = $row;
+				}
+				$db->sql_freeresult($result);
+
+				// Check each style
+				$valid_styles = array();
+				foreach ($styles as $style_row)
+				{
+					if (
+						// Ignore styles with parent style
+						$style_row['template_inherits_id'] == 0 &&
+						// Check if components match
+						$style_row['template_path'] == $style_row['theme_path'] && (!isset($style_row['imageset_path']) || $style_row['template_path'] == $style_row['imageset_path']) &&
+						// Check if components are valid
+						in_array($style_row['template_path'], $available_styles)
+						)
+					{
+						// Valid style. Keep it
+						$sql_ary = array(
+							'style_path'	=> $style_row['template_path'],
+							'bbcode_bitfield'	=> $style_row['bbcode_bitfield'],
+							'style_parent_id'	=> 0,
+							'style_parent_tree'	=> '',
+						);
+						_sql('UPDATE ' . STYLES_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE style_id = ' . $style_row['style_id'], $errored, $error_ary);
+						$valid_styles[] = $style_row['style_id'];
+					}
+				}
+
+				// Remove old styles tables
+				$changes = array(
+					'drop_columns'      => array(
+						STYLES_TABLE		    => array(
+							'imageset_id',
+							'template_id',
+							'theme_id',
+						),
+					),
+
+					'drop_tables'       => array(
+						STYLES_IMAGESET_TABLE,
+						STYLES_IMAGESET_DATA_TABLE,
+						STYLES_TEMPLATE_TABLE,
+						STYLES_TEMPLATE_DATA_TABLE,
+						STYLES_THEME_TABLE,
+					)
+				);
+				$statements = $db_tools->perform_schema_changes($changes);
+
+				foreach ($statements as $sql)
+				{
+					_sql($sql, $errored, $error_ary);
+				}
+
+				// Remove old entries from styles table
+				if (!sizeof($valid_styles))
+				{
+					// No valid styles: remove everything and add prosilver
+					_sql('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
+
+					$sql = 'INSERT INTO ' . STYLES_TABLE . " (style_id, style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES (1, 'prosilver', '&copy; phpBB Group', 1, 'prosilver', 'kNg=', 0, '')";
+					_sql($sql, $errored, $error_ary);
+
+					set_config('default_style', '1');
+
+					$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
+					_sql($sql, $errored, $error_ary);
+				}
+				else
+				{
+					// There are valid styles in styles table. Remove styles that are outdated
+					_sql('DELETE FROM ' . STYLES_TABLE . ' WHERE ' . $db->sql_in_set('style_id', $valid_styles, true), $errored, $error_ary);
+
+					// Change default style
+					if (!in_array($config['default_style'], $valid_styles))
+					{
+						set_config('default_style', $valid_styles[0]);
+					}
+
+					// Reset styles for users
+					_sql('UPDATE ' . USERS_TABLE . ' SET user_style = 0 WHERE ' . $db->sql_in_set('user_style', $valid_styles, true), $errored, $error_ary);
+				}
+			}
+
 			$no_updates = false;
 
 			if (!isset($config['assets_version']))
-- 
cgit v1.2.1


From ea8f83de6f87af8fc9413e1be557953cabe8811e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 19 Apr 2012 03:06:40 +0200
Subject: [ticket/10759] Fix whitespace in database_update.php

PHPBB3-10759
---
 phpBB/install/database_update.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0b33168496..cddc1c4164 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2310,7 +2310,7 @@ function change_database_data(&$no_updates, $version)
 			_add_modules($modules_to_install);
 
 			$sql = 'DELETE FROM ' . MODULES_TABLE . "
-			    WHERE (module_basename = 'styles' OR module_basename = 'acp_styles') AND (module_mode = 'imageset' OR module_mode = 'theme' OR module_mode = 'template')";
+				WHERE (module_basename = 'styles' OR module_basename = 'acp_styles') AND (module_mode = 'imageset' OR module_mode = 'theme' OR module_mode = 'template')";
 			_sql($sql, $errored, $error_ary);
 
 			// Localise Global Announcements
@@ -2474,15 +2474,15 @@ function change_database_data(&$no_updates, $version)
 
 				// Remove old styles tables
 				$changes = array(
-					'drop_columns'      => array(
-						STYLES_TABLE		    => array(
+					'drop_columns'	=> array(
+						STYLES_TABLE		=> array(
 							'imageset_id',
 							'template_id',
 							'theme_id',
 						),
 					),
 
-					'drop_tables'       => array(
+					'drop_tables'	=> array(
 						STYLES_IMAGESET_TABLE,
 						STYLES_IMAGESET_DATA_TABLE,
 						STYLES_TEMPLATE_TABLE,
-- 
cgit v1.2.1


From c43373068636a4f361423f2fe41231ac2e32f70f Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 19 Apr 2012 03:18:20 +0200
Subject: [ticket/10759] Retrieve style_id after INSERT since we cannot set it

PHPBB3-10759
---
 phpBB/install/database_update.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index cddc1c4164..d71226a29c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2503,10 +2503,17 @@ function change_database_data(&$no_updates, $version)
 					// No valid styles: remove everything and add prosilver
 					_sql('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
 
-					$sql = 'INSERT INTO ' . STYLES_TABLE . " (style_id, style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES (1, 'prosilver', '&copy; phpBB Group', 1, 'prosilver', 'kNg=', 0, '')";
+					$sql = 'INSERT INTO ' . STYLES_TABLE . " (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '&copy; phpBB Group', 1, 'prosilver', 'kNg=', 0, '')";
 					_sql($sql, $errored, $error_ary);
 
-					set_config('default_style', '1');
+					$sql = 'SELECT style_id
+						FROM ' . $table . "
+						WHERE style_name = 'prosilver'";
+					$result = _sql($sql, $errored, $error_ary);
+					$default_style = $db->sql_fetchfield($result);
+					$db->sql_freeresult($result);
+
+					set_config('default_style', $default_style);
 
 					$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
 					_sql($sql, $errored, $error_ary);
-- 
cgit v1.2.1


From 0b7a0fa2d11c4f30d31e36f2c11c574491432d4a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 19 Apr 2012 03:27:42 +0200
Subject: [ticket/10759] Clarify comments a bit

PHPBB3-10759
---
 phpBB/install/database_update.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index d71226a29c..c30508dcee 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2404,7 +2404,7 @@ function change_database_data(&$no_updates, $version)
 			// Check if styles table was already updated
 			if ($db_tools->sql_table_exists(STYLES_THEME_TABLE))
 			{
-				// Get list of valid installed styles
+				// Get list of valid 3.1 styles
 				$available_styles = array('prosilver');
 
 				$iterator = new DirectoryIterator($phpbb_root_path . 'styles');
@@ -2447,12 +2447,12 @@ function change_database_data(&$no_updates, $version)
 				}
 				$db->sql_freeresult($result);
 
-				// Check each style
+				// Decide which styles to keep, all others will be deleted
 				$valid_styles = array();
 				foreach ($styles as $style_row)
 				{
 					if (
-						// Ignore styles with parent style
+						// Delete styles with parent style (not supported yet)
 						$style_row['template_inherits_id'] == 0 &&
 						// Check if components match
 						$style_row['template_path'] == $style_row['theme_path'] && (!isset($style_row['imageset_path']) || $style_row['template_path'] == $style_row['imageset_path']) &&
-- 
cgit v1.2.1


From 18704215216cf31e8d96058d2df7ef7cf20a3f7b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 19 Apr 2012 03:38:01 +0200
Subject: [ticket/10759] Don't select imageset_id, it's not needed

PHPBB3-10759
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c30508dcee..88ebb8209e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2425,7 +2425,7 @@ function change_database_data(&$no_updates, $version)
 				// Get all installed styles
 				if ($db_tools->sql_table_exists(STYLES_IMAGESET_TABLE))
 				{
-					$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path, i.imageset_id
+					$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path
 						FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
 						WHERE t.template_id = s.template_id
 							AND c.theme_id = s.theme_id
-- 
cgit v1.2.1


From 439ade4ee2f2fcd301ad3690624a821a779c95ee Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 19 Apr 2012 03:51:17 +0200
Subject: [ticket/10759] Make sure style ids are integers

PHPBB3-10759
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 88ebb8209e..a0892005d2 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2468,7 +2468,7 @@ function change_database_data(&$no_updates, $version)
 							'style_parent_tree'	=> '',
 						);
 						_sql('UPDATE ' . STYLES_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE style_id = ' . $style_row['style_id'], $errored, $error_ary);
-						$valid_styles[] = $style_row['style_id'];
+						$valid_styles[] = (int) $style_row['style_id'];
 					}
 				}
 
-- 
cgit v1.2.1


From 6cecc91326135fbb36eb9d73aa25fc40cfdfb54b Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 13:23:08 +0300
Subject: [ticket/10756] Removing path provider from template class

Removing path provider from template class because it is not used by template class

PHPBB3-10756
---
 phpBB/install/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index bb10521bba..be5ebc53b5 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -202,7 +202,7 @@ $config = new phpbb_config(array(
 
 $phpbb_style_resource_locator = new phpbb_style_resource_locator();
 $phpbb_style_path_provider = new phpbb_style_path_provider();
-$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
+$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator);
 $phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
 $phpbb_style->set_ext_dir_prefix('adm/');
 $phpbb_style->set_custom_style('admin', '../adm/style', '');
-- 
cgit v1.2.1


From d91abbb146d3a808764bf19b9e6adc6e14db1751 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 13:57:12 +0300
Subject: [ticket/10756] Renaming phpbb_style_template to phpbb_template

Renaming phpbb_style_template to phpbb_template

PHPBB3-10756
---
 phpBB/install/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index be5ebc53b5..f992b67bb7 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -202,7 +202,7 @@ $config = new phpbb_config(array(
 
 $phpbb_style_resource_locator = new phpbb_style_resource_locator();
 $phpbb_style_path_provider = new phpbb_style_path_provider();
-$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator);
+$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator);
 $phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
 $phpbb_style->set_ext_dir_prefix('adm/');
 $phpbb_style->set_custom_style('admin', '../adm/style', '');
-- 
cgit v1.2.1


From 00172afa532c99329f4683ecaefb0ba851e46b94 Mon Sep 17 00:00:00 2001
From: riadhchtara <riadh.chtara@gmail.com>
Date: Sun, 15 Apr 2012 12:36:42 +0100
Subject: [ticket/10813] Installer now checks json extension

Installer now checks json extension and cannot continue without it.
Changes are made in phpBB/install/install_install.php where the
checking for json is added and to phpBB/language/en/install.php where
2 new keys for the messages that would be displayed are also added.

PHPBB3-10813
---
 phpBB/install/install_install.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 7558fde944..ad84155585 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -128,7 +128,7 @@ class install_install extends module
 			'BODY'		=> $lang['REQUIREMENTS_EXPLAIN'],
 		));
 
-		$passed = array('php' => false, 'db' => false, 'files' => false, 'pcre' => false, 'imagesize' => false,);
+		$passed = array('php' => false, 'db' => false, 'files' => false, 'pcre' => false, 'imagesize' => false, 'json' => false,);
 
 		// Test for basic PHP settings
 		$template->assign_block_vars('checks', array(
@@ -244,6 +244,26 @@ class install_install extends module
 			'S_EXPLAIN'		=> true,
 			'S_LEGEND'		=> false,
 		));
+		
+		// Check for php json support
+		if (@extension_loaded('json'))
+		{
+			$passed['json'] = true;
+			$result = '<strong style="color:green">' . $lang['YES'] . '</strong>';
+		}
+		else
+		{
+			$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
+		}
+
+		$template->assign_block_vars('checks', array(
+			'TITLE'			=> $lang['PHP_JSON_SUPPORT'],
+			'TITLE_EXPLAIN'	=> $lang['PHP_JSON_SUPPORT_EXPLAIN'],
+			'RESULT'		=> $result,
+
+			'S_EXPLAIN'		=> true,
+			'S_LEGEND'		=> false,
+		));
 
 /**
 *		Better not enabling and adding to the loaded extensions due to the specific requirements needed
-- 
cgit v1.2.1


From edf60bcd550334a521f35700d52d800b1851d693 Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Sat, 14 Apr 2012 18:57:21 +0200
Subject: [ticket/10812] Disabled register_globals check in PHP 5.4

Disabled the check for register_globals if PHP version is 5.4+

PHPBB3-10812
---
 phpBB/install/install_install.php | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 026fc0d404..454c8b4df0 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -166,25 +166,28 @@ class install_install extends module
 			'S_LEGEND'		=> false,
 		));
 
-		// Check for register_globals being enabled
-		if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
+		// Don't check for register_globals on 5.4+
+		if (version_compare($php_version, '5.4.0-dev') < 0)
 		{
-			$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
-		}
-		else
-		{
-			$result = '<strong style="color:green">' . $lang['YES'] . '</strong>';
-		}
-
-		$template->assign_block_vars('checks', array(
-			'TITLE'			=> $lang['PHP_REGISTER_GLOBALS'],
-			'TITLE_EXPLAIN'	=> $lang['PHP_REGISTER_GLOBALS_EXPLAIN'],
-			'RESULT'		=> $result,
+			// Check for register_globals being enabled
+			if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
+			{
+				$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
+			}
+			else
+			{
+				$result = '<strong style="color:green">' . $lang['YES'] . '</strong>';
+			}
 
-			'S_EXPLAIN'		=> true,
-			'S_LEGEND'		=> false,
-		));
+			$template->assign_block_vars('checks', array(
+				'TITLE'			=> $lang['PHP_REGISTER_GLOBALS'],
+				'TITLE_EXPLAIN'	=> $lang['PHP_REGISTER_GLOBALS_EXPLAIN'],
+				'RESULT'		=> $result,
 
+				'S_EXPLAIN'		=> true,
+				'S_LEGEND'		=> false,
+			));
+		}
 
 		// Check for url_fopen
 		if (@ini_get('allow_url_fopen') == '1' || strtolower(@ini_get('allow_url_fopen')) == 'on')
-- 
cgit v1.2.1


From 4788705a9a885df4bc9af834d6911a8c9919ce0b Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sun, 15 Apr 2012 15:01:32 +0530
Subject: [ticket/10815] enables feed feature by default for a fresh install

PHPBB3-10815
---
 phpBB/install/schemas/schema_data.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index fcc372ae93..efc81e37c0 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -99,7 +99,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_package_size
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_post_confirm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_enable', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_enable', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_http_auth', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_limit_post', '15');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_limit_topic', '10');
-- 
cgit v1.2.1


From de70b17b1dc19e19faa0d56395a1aba8868c9624 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Fri, 20 Apr 2012 23:50:49 -0500
Subject: [ticket/10492] Separate config generation from the installer

PHPBB3-10492
---
 phpBB/install/install_install.php | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 454c8b4df0..81dac9ecde 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -884,34 +884,8 @@ class install_install extends module
 
 		@chmod($phpbb_root_path . 'cache/install_lock', 0777);
 
-		$load_extensions = implode(',', $load_extensions);
-
 		// Time to convert the data provided into a config file
-		$config_data = "<?php\n";
-		$config_data .= "// phpBB 3.0.x auto-generated configuration file\n// Do not change anything in this file!\n";
-
-		$config_data_array = array(
-			'dbms'			=> $available_dbms[$data['dbms']]['DRIVER'],
-			'dbhost'		=> $data['dbhost'],
-			'dbport'		=> $data['dbport'],
-			'dbname'		=> $data['dbname'],
-			'dbuser'		=> $data['dbuser'],
-			'dbpasswd'		=> htmlspecialchars_decode($data['dbpasswd']),
-			'table_prefix'	=> $data['table_prefix'],
-			'acm_type'		=> 'file',
-			'load_extensions'	=> $load_extensions,
-		);
-
-		foreach ($config_data_array as $key => $value)
-		{
-			$config_data .= "\${$key} = '" . str_replace("'", "\\'", str_replace('\\', '\\\\', $value)) . "';\n";
-		}
-		unset($config_data_array);
-
-		$config_data .= "\n@define('PHPBB_INSTALLED', true);\n";
-		$config_data .= "// @define('DEBUG', true);\n";
-		$config_data .= "// @define('DEBUG_EXTRA', true);\n";
-		$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
+		$config_data = phpbb_create_config_file_data($data, $available_dbms[$data['dbms']]['DRIVER'], $load_extensions);
 
 		// Attempt to write out the config file directly. If it works, this is the easiest way to do it ...
 		if ((file_exists($phpbb_root_path . 'config.' . $phpEx) && phpbb_is_writable($phpbb_root_path . 'config.' . $phpEx)) || phpbb_is_writable($phpbb_root_path))
-- 
cgit v1.2.1


From a21b367b21d811a3673145572b0bdd123ccc4767 Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Sat, 21 Apr 2012 14:16:55 +0200
Subject: [ticket/10836] Enable avatars by default at install

Enables avatars and local avatar upload by default.

PHPBB3-10836
---
 phpBB/install/schemas/schema_data.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index efc81e37c0..ba2d18da00 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -8,10 +8,10 @@
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('active_sessions', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_attachments', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_autologin', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote_upload', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_birthdays', '1');
-- 
cgit v1.2.1


From 1a8db76a200bd0de0bf17acd89e87e4875513d4c Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Sat, 21 Apr 2012 22:52:11 +0200
Subject: [ticket/10836] Check if avatar directory is writable after install

Check if the avatar directory is writeable after the installation is complete.
If it isn't, disable avatars and avatar uploading by default.

PHPBB3-10836
---
 phpBB/install/install_install.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 81dac9ecde..35fc0bb58e 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -105,6 +105,7 @@ class install_install extends module
 				$this->add_language($mode, $sub);
 				$this->add_bots($mode, $sub);
 				$this->email_admin($mode, $sub);
+				$this->disable_avatars_if_unwritable();
 
 				// Remove the lock file
 				@unlink($phpbb_root_path . 'cache/install_lock');
@@ -1941,6 +1942,21 @@ class install_install extends module
 		));
 	}
 
+	/**
+	* Check if the avatar directory is writable and disable avatars
+	* if it isn't writable.
+	*/
+	function disable_avatars_if_unwritable()
+	{
+		global $phpbb_root_path;
+
+		if (!phpbb_is_writable($phpbb_root_path . 'images/avatars/upload/'))
+		{
+			set_config('allow_avatar', 0);
+			set_config('allow_avatar_upload', 0);
+		}
+	}
+
 	/**
 	* Generate a list of available mail server authentication methods
 	*/
-- 
cgit v1.2.1


From ed67dcf3d83d40623471fe191fdc415289c59c21 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 2 May 2012 21:12:18 +0200
Subject: [ticket/10818] Global Announcements Update Dialog should call
 exit_handler()

PHPBB3-10818
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a0892005d2..665db1f2f0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -260,7 +260,7 @@ if ($has_global && !$ga_forum_id)
 		</form>
 	<?php
 	_print_footer();
-	exit;
+	exit_handler();
 }
 
 header('Content-type: text/html; charset=UTF-8');
-- 
cgit v1.2.1


From f71a9d369c84ec938408a2134b09ea259f6cbbab Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 14 May 2012 00:34:42 +0200
Subject: [ticket/10605] Put end of array on its own line because start of
 array is too.

PHPBB3-10605
---
 phpBB/install/database_update.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0737061887..2a361aae26 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2043,7 +2043,8 @@ function change_database_data(&$no_updates, $version)
 						'ON'	=> 'p.msg_id = t.msg_id',
 					),
 				),
-				'WHERE'		=> 't.user_id IS NULL');
+				'WHERE'		=> 't.user_id IS NULL',
+			);
 			$sql = $db->sql_build_query('SELECT', $sql_array);
 
 			do
-- 
cgit v1.2.1


From 95e1d4e9db8d2174c8ee5c6bb35be06abc57e3cf Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 14 May 2012 00:36:18 +0200
Subject: [ticket/10605] Use database updater function _sql() instead of
 $db->sql_query()

PHPBB3-10605
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2a361aae26..95a0282878 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2062,7 +2062,7 @@ function change_database_data(&$no_updates, $version)
 				{
 					$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
 						WHERE ' . $db->sql_in_set('msg_id', $delete_pms);
-					$db->sql_query($sql);
+					_sql($sql, $errored, $error_ary);
 				}
 			}
 			while (sizeof($delete_pms) == $batch_size);
-- 
cgit v1.2.1


From ffabfefe459c8fd94bf0706766134dd821d294a7 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 22 May 2012 10:14:20 -0400
Subject: [ticket/10906] Add setting for last post topic title in
 schema_data.sql

PHPBB3-10906
---
 phpBB/install/schemas/schema_data.sql | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 2ea5eca768..5489fd4e3d 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -88,6 +88,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('dbms_version', '')
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat', 'D M d, Y g:i a');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_subject', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_order', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('edit_time', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('delete_time', '0');
-- 
cgit v1.2.1


From d8ddda512180be56100a890410dece8046aade28 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 May 2012 20:19:28 +0200
Subject: [develop-olympus] Bumping version numbers to final for 3.0.11
 releases.

---
 phpBB/install/convertors/convert_phpbb20.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 81cc2f68f3..7d6fed6164 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -32,7 +32,7 @@ unset($dbpasswd);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.0.10',
+	'phpbb_version'	=> '3.0.11',
 	'author'		=> '<a href="http://www.phpbb.com/">phpBB Group</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
-- 
cgit v1.2.1


From 2011085c29d3141d66d390449b52ba6bd069ab69 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 May 2012 20:26:28 +0200
Subject: [develop-olympus] Bump version numbers for 3.0.11-RC1 release.

---
 phpBB/install/database_update.php     | 6 +++---
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c700b483a5..c1fe144c62 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.11-dev');
+define('UPDATES_TO_VERSION', '3.0.11-RC1');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -951,7 +951,7 @@ function database_update_info()
 						// this column was removed from the database updater
 						// after 3.0.9-RC3 was released. It might still exist
 						// in 3.0.9-RCX installations and has to be dropped in
-						// 3.0.11 after the db_tools class is capable of properly
+						// 3.0.12 after the db_tools class is capable of properly
 						// removing a primary key.
 						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
 						'attempt_ip'			=> array('VCHAR:40', ''),
@@ -996,7 +996,7 @@ function database_update_info()
 		// No changes from 3.0.10 to 3.0.11-RC1
 		'3.0.10'		=> array(),
 
-		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
+		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 	);
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index ba2d18da00..99b8f7f96d 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,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.11-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-RC1');
 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');
 
-- 
cgit v1.2.1


From 118c5d90daa783ff55319e6121c0fc77166fe58c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 May 2012 22:07:34 +0200
Subject: [develop-olympus] Incrementing the version to 3.0.12-dev in
 develop-olympus.

---
 phpBB/install/database_update.php     | 2 +-
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c1fe144c62..a52a329f20 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.11-RC1');
+define('UPDATES_TO_VERSION', '3.0.12-dev');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 99b8f7f96d..b139857d28 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,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.11-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.12-dev');
 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');
 
-- 
cgit v1.2.1


From a9549cbe6ab66732fcf9c321496b74943e2972e7 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sun, 3 Jun 2012 15:56:55 +0530
Subject: [feature-delete-auto-logins] adds module to database update

ucp delete auto-login keys module is added to database_update.php
under 3.1-dev
---
 phpBB/install/database_update.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 665db1f2f0..a5bd5e7bfe 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2305,6 +2305,13 @@ function change_database_data(&$no_updates, $version)
 					'auth'		=> 'acl_a_styles',
 					'cat'		=> 'ACP_STYLE_MANAGEMENT',
 				),
+				'autologin_keys'	=> array(
+					'base'		=> 'ucp_profile',
+					'class'		=> 'ucp',
+					'title'		=> 'UCP_PROFILE_AUTOLOGIN_KEYS',
+					'auth'		=> '',
+					'cat'		=> 'UCP_PROFILE',
+				),
 			);
 
 			_add_modules($modules_to_install);
-- 
cgit v1.2.1


From 0191e1313ca8179bb09a2fc6f3d06de95768bc96 Mon Sep 17 00:00:00 2001
From: wagnerch <wagnerch@code.phpbb.com>
Date: Sun, 22 Jul 2007 22:23:00 +0000
Subject: [feature/postgresql-fulltext-search] PostgreSQL fulltext search,
 version 1.

PHPBB3-9730
---
 phpBB/install/schemas/fulltext_postgres.sql | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 phpBB/install/schemas/fulltext_postgres.sql

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/fulltext_postgres.sql b/phpBB/install/schemas/fulltext_postgres.sql
new file mode 100644
index 0000000000..0be6648d0c
--- /dev/null
+++ b/phpBB/install/schemas/fulltext_postgres.sql
@@ -0,0 +1,3 @@
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_max_word_len', '254');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_min_word_len', '4');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_ts_name', 'default');
-- 
cgit v1.2.1


From 3c6272ff0475dc19cc67553f370ce227214d0613 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 4 Jun 2012 23:28:48 +0200
Subject: [feature/new-tz-handling] Remove appearances of board_dst and
 user_dst

PHPBB3-9558
---
 phpBB/install/database_update.php     | 2 +-
 phpBB/install/install_install.php     | 2 +-
 phpBB/install/schemas/schema_data.sql | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9758ad3b2b..b6f7f82785 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1971,7 +1971,7 @@ function change_database_data(&$no_updates, $version)
 					'user_email'			=> '',
 					'user_lang'				=> $config['default_lang'],
 					'user_style'			=> $config['default_style'],
-					'user_timezone'			=> 0,
+					'user_timezone'			=> 'UTC',
 					'user_dateformat'		=> $config['default_dateformat'],
 					'user_allow_massemail'	=> 0,
 				);
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index ef384edb78..bafcefe3f5 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1795,7 +1795,7 @@ class install_install extends module
 				'user_email'			=> '',
 				'user_lang'				=> $data['default_lang'],
 				'user_style'			=> 1,
-				'user_timezone'			=> 0,
+				'user_timezone'			=> 'UTC',
 				'user_dateformat'		=> $lang['default_dateformat'],
 				'user_allow_massemail'	=> 0,
 			);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5489fd4e3d..307864825c 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -54,12 +54,11 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_salt', 'php
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact', 'contact@yourdomain.tld');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable_msg', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_dst', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email', 'address@yourdomain.tld');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig', '{L_CONFIG_BOARD_EMAIL_SIG}');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_hide_emails', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone', 'UTC');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_interval', '10');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_type', 'd');
-- 
cgit v1.2.1


From 902a79bfdabb2c459f2385cff80b5fa38099d2f7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 20 Jun 2012 00:50:33 +0200
Subject: [feature/new-tz-handling] Readd Database updater changes from Oleg

The change here converts user_timezone to vchar and computes
timezone identifiers from the offsets. It uses database-specific
functions for building SQL conditionals and concatenations which
need to be implemented, probably in a separate ticket. As a result
the current code is not functional.

The changes are tricky since we need to drop user_dst column from
users table, but we need it during the data migration process to
properly calculate effective timezones for all users.

PHPBB3-9558
---
 phpBB/install/database_update.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b6f7f82785..dd2d04d3a6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2588,6 +2588,33 @@ function change_database_data(&$no_updates, $version)
 				$config->set('assets_version', '1');
 			}
 
+			// If the column exists, we did not yet update the users timezone
+			if ($db_tools->sql_column_exists(USERS_TABLE, 'user_dst'))
+			{
+				// Update timezones
+				// user_dst is 0 if not in dst and 1 if in dst;
+				// this happens to be exactly the correction that should be added to the timezone offset
+				// to obtain dst offset.
+				// Parenthesize here because we operate on this value later.
+				$active_offset = '(user_timezone + user_dst)';
+
+				// Now we have a tricky problem of forcing the plus sign into the expression.
+				// Build it via a conditional since there cannot be a portable printf equivalent in databases.
+				// Note that active offset is not an absolute value here - it is an expression that will
+				// be evaluated by the database during query execution.
+				// We don't print - (minus) here because it will come from active offset.
+				$sign = $db->sql_conditional("$active_offset < 0", '', '+');
+
+				// Use database-specific escaping because strings are quoted differently by different databases.
+				$new_value = $db->sql_concatenate($db->sql_escape('GMT'), $sign, $active_offset);
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_timezone = ' . $new_value;
+				_sql($sql, $errored, $error_ary);
+
+				// After we have calculated the timezones we can delete user_dst column from user table.
+				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
+			}
+
 		break;
 	}
 }
-- 
cgit v1.2.1


From 81d5327e4411a7044f1c90e002505cad309372d6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 20 Jun 2012 13:56:11 +0200
Subject: [ticket/10937] Comment removal functions: Restore backward
 compatibility

PHPBB3-10937
---
 phpBB/install/install_install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 8e3fe0387c..f1003b07d7 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1164,7 +1164,7 @@ class install_install extends module
 
 		$sql_query = preg_replace('#phpbb_#i', $data['table_prefix'], $sql_query);
 
-		$sql_query = remove_comments($sql_query);
+		$sql_query = phpbb_remove_comments($sql_query);
 
 		$sql_query = split_sql_file($sql_query, $delimiter);
 
@@ -1202,7 +1202,7 @@ class install_install extends module
 		// Change language strings...
 		$sql_query = preg_replace_callback('#\{L_([A-Z0-9\-_]*)\}#s', 'adjust_language_keys_callback', $sql_query);
 
-		$sql_query = remove_comments($sql_query);
+		$sql_query = phpbb_remove_comments($sql_query);
 		$sql_query = split_sql_file($sql_query, ';');
 
 		foreach ($sql_query as $sql)
-- 
cgit v1.2.1


From 9f4219b1c7e74f86134b51fa637b513c5a670b5f Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 1 May 2012 16:09:08 +0530
Subject: [feature/postgresql-fulltext-search] minor changes

Some changes in code to get it work against current develop.
PosgreSQL Fulltext search works for new install now.

PHPBB3-9730
---
 phpBB/install/schemas/fulltext_postgres.sql | 3 ---
 phpBB/install/schemas/schema_data.sql       | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 phpBB/install/schemas/fulltext_postgres.sql

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/fulltext_postgres.sql b/phpBB/install/schemas/fulltext_postgres.sql
deleted file mode 100644
index 0be6648d0c..0000000000
--- a/phpBB/install/schemas/fulltext_postgres.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_max_word_len', '254');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_min_word_len', '4');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_ts_name', 'default');
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 2ea5eca768..fa6cff1bbd 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -124,6 +124,9 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_co
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_load_upd', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_max_chars', '14');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_min_chars', '3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_max_word_len', '254');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_min_word_len', '4');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_ts_name', 'simple');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold', '25');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path', 'images/icons');
-- 
cgit v1.2.1


From 8a659964e4788144fde24c4f43362ab2450582f8 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Thu, 7 Jun 2012 01:11:12 +0530
Subject: [feature/postgresql-fulltext-search] database changes in
 database_update

config entries are now added by database_update.php as well.
PostgreSQL will work during update too.

PHPBB3-9730
---
 phpBB/install/database_update.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 665db1f2f0..3716c03030 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2207,6 +2207,13 @@ function change_database_data(&$no_updates, $version)
 				set_config('search_type', 'phpbb_search_' . $config['search_type']);
 			}
 
+			if (!isset($config['fulltext_postgres_ts_name']))
+			{
+				set_config('fulltext_postgres_max_word_len', 254);
+				set_config('fulltext_postgres_min_word_len', 4);
+				set_config('fulltext_postgres_ts_name', 'simple');
+			}
+
 			if (!isset($config['load_jquery_cdn']))
 			{
 				set_config('load_jquery_cdn', 0);
-- 
cgit v1.2.1


From d37c9cab6bc8444685c642b4a6bce6108f054acc Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 26 Jun 2012 01:36:34 +0530
Subject: [feature/postgresql-fulltext-search] each config is checked if it is
 set

In database_update.php each config value of postgres fulltext search is
first checked whether it already exists or not and then added.

PHPBB3-9730
---
 phpBB/install/database_update.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 3716c03030..a6e5921b63 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2209,11 +2209,19 @@ function change_database_data(&$no_updates, $version)
 
 			if (!isset($config['fulltext_postgres_ts_name']))
 			{
-				set_config('fulltext_postgres_max_word_len', 254);
-				set_config('fulltext_postgres_min_word_len', 4);
 				set_config('fulltext_postgres_ts_name', 'simple');
 			}
 
+			if (!isset($config['fulltext_postgres_min_word_len']))
+			{
+				set_config('fulltext_postgres_min_word_len', 4);
+			}
+
+			if (!isset($config['fulltext_postgres_max_word_len']))
+			{
+				set_config('fulltext_postgres_max_word_len', 254);
+			}
+
 			if (!isset($config['load_jquery_cdn']))
 			{
 				set_config('load_jquery_cdn', 0);
-- 
cgit v1.2.1


From 7ce66deca8dbe8187b86e130e8011be998580b4e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 18 Jul 2012 14:48:28 +0200
Subject: [feature/new-tz-handling] Correctly update user and board timezones
 on update

PHPBB3-9558
---
 phpBB/install/database_update.php | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 360e12e0b6..a3a51324a9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2613,25 +2613,24 @@ function change_database_data(&$no_updates, $version)
 			// If the column exists, we did not yet update the users timezone
 			if ($db_tools->sql_column_exists(USERS_TABLE, 'user_dst'))
 			{
-				// Update timezones
-				// user_dst is 0 if not in dst and 1 if in dst;
-				// this happens to be exactly the correction that should be added to the timezone offset
-				// to obtain dst offset.
-				// Parenthesize here because we operate on this value later.
-				$active_offset = '(user_timezone + user_dst)';
-
-				// Now we have a tricky problem of forcing the plus sign into the expression.
-				// Build it via a conditional since there cannot be a portable printf equivalent in databases.
-				// Note that active offset is not an absolute value here - it is an expression that will
-				// be evaluated by the database during query execution.
-				// We don't print - (minus) here because it will come from active offset.
-				$sign = $db->sql_conditional("$active_offset < 0", '', '+');
-
-				// Use database-specific escaping because strings are quoted differently by different databases.
-				$new_value = $db->sql_concatenate($db->sql_escape('GMT'), $sign, $active_offset);
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_timezone = ' . $new_value;
-				_sql($sql, $errored, $error_ary);
+				// Update user timezones
+				$sql = 'SELECT user_dst, user_timezone
+					FROM ' . USERS_TABLE . '
+					GROUP BY user_timezone, user_dst';
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$sql = 'UPDATE ' . USERS_TABLE . "
+						SET user_timezone = '" . $db->sql_escape(_convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
+						WHERE user_timezone = '" . $db->sql_escape($row['user_timezone']) . "'
+							AND user_dst = " . (int) $row['user_dst'];
+					_sql($sql, $errored, $error_ary);
+				}
+				$db->sql_freeresult($result);
+
+				// Update board default timezone
+				set_config('board_timezone', _convert_phpbb30_timezone($config['board_timezone'], $config['board_dst']));
 
 				// After we have calculated the timezones we can delete user_dst column from user table.
 				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
-- 
cgit v1.2.1


From 8078a04f3a3816b4515da01eb3635ae8141db26b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 18 Jul 2012 14:52:51 +0200
Subject: [feature/new-tz-handling] Add function to update the timezone

PHPBB3-9558
---
 phpBB/install/database_update.php | 99 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a3a51324a9..43363babe1 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -809,6 +809,105 @@ function _add_modules($modules_to_install)
 	$_module->remove_cache_file();
 }
 
+/**
+* Determinate the new timezone for a given phpBB 3.0 timezone and
+* "Daylight Saving Time" option
+*
+*	@param	$timezone	float	Users timezone in 3.0
+*	@param	$dst		int		Users daylight saving time
+*	@return		string		Users new php Timezone which is used since 3.1
+*/
+function _convert_phpbb30_timezone($timezone, $dst)
+{
+	$offset = $timezone + $dst;
+
+	switch ($timezone)
+	{
+		case '-12':
+			return 'Etc/GMT' . $offset;		//'[UTC - 12] Baker Island Time'
+		case '-11':
+			return 'Etc/GMT' . $offset;		//'[UTC - 11] Niue Time, Samoa Standard Time'
+		case '-10':
+			return 'Etc/GMT' . $offset;		//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
+		case '-9.5':
+			return 'Pacific/Marquesas';		//'[UTC - 9:30] Marquesas Islands Time'
+		case '-9':
+			return 'Etc/GMT' . $offset;		//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
+		case '-8':
+			return 'Etc/GMT' . $offset;		//'[UTC - 8] Pacific Standard Time'
+		case '-7':
+			return 'Etc/GMT' . $offset;		//'[UTC - 7] Mountain Standard Time'
+		case '-6':
+			return 'Etc/GMT' . $offset;		//'[UTC - 6] Central Standard Time'
+		case '-5':
+			return 'Etc/GMT' . $offset;		//'[UTC - 5] Eastern Standard Time'
+		case '-4.5':
+			return 'America/Caracas';		//'[UTC - 4:30] Venezuelan Standard Time'
+		case '-4':
+			return 'Etc/GMT' . $offset;		//'[UTC - 4] Atlantic Standard Time'
+		case '-3.5':
+			return 'America/St_Johns';		//'[UTC - 3:30] Newfoundland Standard Time'
+		case '-3':
+			return 'Etc/GMT' . $offset;		//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
+		case '-2':
+			return 'Etc/GMT' . $offset;		//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
+		case '-1':
+			return 'Etc/GMT' . $offset;		//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
+		case '0':
+			return (!$dst) ? 'UTC' : 'Etc/GMT+1';		//'[UTC] Western European Time, Greenwich Mean Time'
+		case '1':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 1] Central European Time, West African Time'
+		case '2':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 2] Eastern European Time, Central African Time'
+		case '3':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 3] Moscow Standard Time, Eastern African Time'
+		case '3.5':
+			return 'Asia/Tehran';			//'[UTC + 3:30] Iran Standard Time'
+		case '4':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
+		case '4.5':
+			return 'Asia/Kabul';			//'[UTC + 4:30] Afghanistan Time'
+		case '5':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
+		case '5.5':
+			return 'Asia/Kolkata';			//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
+		case '5.75':
+			return 'Asia/Kathmandu';		//'[UTC + 5:45] Nepal Time'
+		case '6':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
+		case '6.5':
+			return 'Indian/Cocos';			//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
+		case '7':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
+		case '8':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
+		case '8.75':
+			return 'Australia/Eucla';		//'[UTC + 8:45] Southeastern Western Australia Standard Time'
+		case '9':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
+		case '9.5':
+			return 'Australia/ACT';			//'[UTC + 9:30] Australian Central Standard Time'
+		case '10':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
+		case '10.5':
+			return 'Australia/Lord_Howe';	//'[UTC + 10:30] Lord Howe Standard Time'
+		case '11':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
+		case '11.5':
+			return 'Pacific/Norfolk';		//'[UTC + 11:30] Norfolk Island Time'
+		case '12':
+			return 'Etc/GMT+12';			//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
+		case '12.75':
+			return 'Pacific/Chatham';		//'[UTC + 12:45] Chatham Islands Time'
+		case '13':
+			return 'Pacific/Tongatapu';		//'[UTC + 13] Tonga Time, Phoenix Islands Time'
+		case '14':
+			return 'Pacific/Kiritimati';	//'[UTC + 14] Line Island Time'
+		default:
+			return 'UTC';
+	}
+}
+
 /****************************************************************************
 * ADD YOUR DATABASE SCHEMA CHANGES HERE										*
 *****************************************************************************/
-- 
cgit v1.2.1


From 14a07b11936bc061b5c82daa6387eb4645974fac Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 18 Jul 2012 17:18:10 +0200
Subject: [feature/new-tz-handling] Move update helper function to new class

PHPBB3-9558
---
 phpBB/install/database_update.php | 105 ++------------------------------------
 1 file changed, 4 insertions(+), 101 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 43363babe1..6e99fd56a0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -809,105 +809,6 @@ function _add_modules($modules_to_install)
 	$_module->remove_cache_file();
 }
 
-/**
-* Determinate the new timezone for a given phpBB 3.0 timezone and
-* "Daylight Saving Time" option
-*
-*	@param	$timezone	float	Users timezone in 3.0
-*	@param	$dst		int		Users daylight saving time
-*	@return		string		Users new php Timezone which is used since 3.1
-*/
-function _convert_phpbb30_timezone($timezone, $dst)
-{
-	$offset = $timezone + $dst;
-
-	switch ($timezone)
-	{
-		case '-12':
-			return 'Etc/GMT' . $offset;		//'[UTC - 12] Baker Island Time'
-		case '-11':
-			return 'Etc/GMT' . $offset;		//'[UTC - 11] Niue Time, Samoa Standard Time'
-		case '-10':
-			return 'Etc/GMT' . $offset;		//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
-		case '-9.5':
-			return 'Pacific/Marquesas';		//'[UTC - 9:30] Marquesas Islands Time'
-		case '-9':
-			return 'Etc/GMT' . $offset;		//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
-		case '-8':
-			return 'Etc/GMT' . $offset;		//'[UTC - 8] Pacific Standard Time'
-		case '-7':
-			return 'Etc/GMT' . $offset;		//'[UTC - 7] Mountain Standard Time'
-		case '-6':
-			return 'Etc/GMT' . $offset;		//'[UTC - 6] Central Standard Time'
-		case '-5':
-			return 'Etc/GMT' . $offset;		//'[UTC - 5] Eastern Standard Time'
-		case '-4.5':
-			return 'America/Caracas';		//'[UTC - 4:30] Venezuelan Standard Time'
-		case '-4':
-			return 'Etc/GMT' . $offset;		//'[UTC - 4] Atlantic Standard Time'
-		case '-3.5':
-			return 'America/St_Johns';		//'[UTC - 3:30] Newfoundland Standard Time'
-		case '-3':
-			return 'Etc/GMT' . $offset;		//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
-		case '-2':
-			return 'Etc/GMT' . $offset;		//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
-		case '-1':
-			return 'Etc/GMT' . $offset;		//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
-		case '0':
-			return (!$dst) ? 'UTC' : 'Etc/GMT+1';		//'[UTC] Western European Time, Greenwich Mean Time'
-		case '1':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 1] Central European Time, West African Time'
-		case '2':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 2] Eastern European Time, Central African Time'
-		case '3':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 3] Moscow Standard Time, Eastern African Time'
-		case '3.5':
-			return 'Asia/Tehran';			//'[UTC + 3:30] Iran Standard Time'
-		case '4':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
-		case '4.5':
-			return 'Asia/Kabul';			//'[UTC + 4:30] Afghanistan Time'
-		case '5':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
-		case '5.5':
-			return 'Asia/Kolkata';			//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
-		case '5.75':
-			return 'Asia/Kathmandu';		//'[UTC + 5:45] Nepal Time'
-		case '6':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
-		case '6.5':
-			return 'Indian/Cocos';			//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
-		case '7':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
-		case '8':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
-		case '8.75':
-			return 'Australia/Eucla';		//'[UTC + 8:45] Southeastern Western Australia Standard Time'
-		case '9':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
-		case '9.5':
-			return 'Australia/ACT';			//'[UTC + 9:30] Australian Central Standard Time'
-		case '10':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
-		case '10.5':
-			return 'Australia/Lord_Howe';	//'[UTC + 10:30] Lord Howe Standard Time'
-		case '11':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
-		case '11.5':
-			return 'Pacific/Norfolk';		//'[UTC + 11:30] Norfolk Island Time'
-		case '12':
-			return 'Etc/GMT+12';			//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
-		case '12.75':
-			return 'Pacific/Chatham';		//'[UTC + 12:45] Chatham Islands Time'
-		case '13':
-			return 'Pacific/Tongatapu';		//'[UTC + 13] Tonga Time, Phoenix Islands Time'
-		case '14':
-			return 'Pacific/Kiritimati';	//'[UTC + 14] Line Island Time'
-		default:
-			return 'UTC';
-	}
-}
-
 /****************************************************************************
 * ADD YOUR DATABASE SCHEMA CHANGES HERE										*
 *****************************************************************************/
@@ -1225,6 +1126,8 @@ function change_database_data(&$no_updates, $version)
 {
 	global $db, $errored, $error_ary, $config, $phpbb_root_path, $phpEx, $db_tools;
 
+	$update_helpers = new phpbb_update_helpers();
+
 	switch ($version)
 	{
 		case '3.0.0':
@@ -2721,7 +2624,7 @@ function change_database_data(&$no_updates, $version)
 				while ($row = $db->sql_fetchrow($result))
 				{
 					$sql = 'UPDATE ' . USERS_TABLE . "
-						SET user_timezone = '" . $db->sql_escape(_convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
+						SET user_timezone = '" . $db->sql_escape($update_helpers->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
 						WHERE user_timezone = '" . $db->sql_escape($row['user_timezone']) . "'
 							AND user_dst = " . (int) $row['user_dst'];
 					_sql($sql, $errored, $error_ary);
@@ -2729,7 +2632,7 @@ function change_database_data(&$no_updates, $version)
 				$db->sql_freeresult($result);
 
 				// Update board default timezone
-				set_config('board_timezone', _convert_phpbb30_timezone($config['board_timezone'], $config['board_dst']));
+				set_config('board_timezone', $update_helpers->convert_phpbb30_timezone($config['board_timezone'], $config['board_dst']));
 
 				// After we have calculated the timezones we can delete user_dst column from user table.
 				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
-- 
cgit v1.2.1


From 9711da2763f707408efde160357d51330fd17681 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 10 Jul 2012 05:04:14 +0530
Subject: [feature/sphinx-fulltext-search] adds default config values

Default config values are added to config table in new install as well
as database_update.

PHPBB3-10946
---
 phpBB/install/database_update.php     | 10 ++++++++++
 phpBB/install/schemas/schema_data.sql |  2 ++
 2 files changed, 12 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 594397c815..0ffab8e413 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2260,6 +2260,16 @@ function change_database_data(&$no_updates, $version)
 				set_config('fulltext_postgres_max_word_len', 254);
 			}
 
+			if (!isset($config['fulltext_sphinx_stopwords']))
+			{
+				set_config('fulltext_sphinx_stopwords', 0);
+			}
+
+			if (!isset($config['fulltext_sphinx_indexer_mem_limit']))
+			{
+				set_config('fulltext_sphinx_indexer_mem_limit', 512);
+			}
+
 			if (!isset($config['load_jquery_cdn']))
 			{
 				set_config('load_jquery_cdn', 0);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index deefdafbc4..797f78e889 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -128,6 +128,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_mi
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_max_word_len', '254');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_min_word_len', '4');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_ts_name', 'simple');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_sphinx_indexer_mem_limit', '512');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_sphinx_stopwords', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold', '25');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path', 'images/icons');
-- 
cgit v1.2.1


From 32d2ee61f78e3aeaac5f4f1bcb672c67aa10b10e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 16:14:21 +0200
Subject: [feature/dic] Configure container via config.php, use compiler pass

PHPBB3-10739
---
 phpBB/install/index.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 88745b8bb9..3e14b719e8 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -7,6 +7,11 @@
 *
 */
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Compiler\Compiler;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
 /**#@+
 * @ignore
 */
@@ -71,6 +76,8 @@ else
 
 // Include essential scripts
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
+require($phpbb_root_path . 'includes/di/compiler/config_pass.' . $phpEx);
+
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
 phpbb_require_updated('includes/functions_content.' . $phpEx, true);
@@ -81,13 +88,13 @@ require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
 
 $phpbb_container = new ContainerBuilder();
 $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config'));
-$loader->load('parameters.yml');
 $loader->load('services.yml');
 
-$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
-$phpbb_container->setParameter('core.php_ext', $phpEx);
+$phpbb_compiler = new Compiler();
+$phpbb_compiler->addPass(new phpbb_di_compiler_config_pass($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx));
+$phpbb_compiler->compile($phpbb_container);
+
 $phpbb_container->setAlias('cache.driver.install', 'cache.driver');
-$phpbb_container->set('container', $phpbb_container);
 
 $phpbb_class_loader = $phpbb_container->get('class_loader');
 $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
-- 
cgit v1.2.1


From 967cc550ed9bb74480f46212768502627f26d62d Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 20:42:07 +0200
Subject: [feature/dic] Introduce DI processors instead of abusing compiler
 passes

PHPBB3-10739
---
 phpBB/install/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 3e14b719e8..0e298c8cdc 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -76,7 +76,8 @@ else
 
 // Include essential scripts
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-require($phpbb_root_path . 'includes/di/compiler/config_pass.' . $phpEx);
+require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx);
+require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
@@ -90,9 +91,8 @@ $phpbb_container = new ContainerBuilder();
 $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config'));
 $loader->load('services.yml');
 
-$phpbb_compiler = new Compiler();
-$phpbb_compiler->addPass(new phpbb_di_compiler_config_pass($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx));
-$phpbb_compiler->compile($phpbb_container);
+$processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
+$processor->process($phpbb_container);
 
 $phpbb_container->setAlias('cache.driver.install', 'cache.driver');
 
-- 
cgit v1.2.1


From 50bc453aa6c91ae9c9df5cb633615825c9df7b6d Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 21:02:55 +0200
Subject: [feature/dic] Load services from extensions

PHPBB3-10739
---
 phpBB/install/index.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 0e298c8cdc..1ba0798abc 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -8,7 +8,6 @@
 */
 
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Compiler\Compiler;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
@@ -99,6 +98,12 @@ $phpbb_container->setAlias('cache.driver.install', 'cache.driver');
 $phpbb_class_loader = $phpbb_container->get('class_loader');
 $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
+$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
+foreach ($ids as $id) {
+	$processor = $phpbb_container->get($id);
+	$processor->process($phpbb_container);
+}
+
 // set up caching
 $cache = $phpbb_container->get('cache');
 
-- 
cgit v1.2.1


From 67665f59577092badf7eb0b5585e5ae39c52c8da Mon Sep 17 00:00:00 2001
From: Nathan <exreaction@phpbb.com>
Date: Sat, 14 Jul 2012 18:12:57 -0500
Subject: [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate

PHPBB3-10990
---
 phpBB/install/install_convert.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index db974f9903..ca3994d129 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -933,7 +933,7 @@ class install_convert extends module
 				}
 				else if (sizeof($missing_tables))
 				{
-					$this->p_master->error(sprintf($user->lang['TABLES_MISSING'], implode(', ', $missing_tables)) . '<br /><br />' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__);
+					$this->p_master->error(sprintf($user->lang['TABLES_MISSING'], implode($user->lang['COMMA_SEPARATOR'], $missing_tables)) . '<br /><br />' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__);
 				}
 
 				$url = $this->save_convert_progress('&amp;confirm=1');
-- 
cgit v1.2.1


From a5dd64195a3a88db3fec38ac74dfb5d118ab5622 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 22 Jul 2012 22:26:38 -0500
Subject: [ticket/11021] Add the option to specify a Site home URL and text

PHPBB3-11021
---
 phpBB/install/database_update.php     | 6 ++++++
 phpBB/install/schemas/schema_data.sql | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 6e99fd56a0..18efee72b5 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2637,6 +2637,12 @@ function change_database_data(&$no_updates, $version)
 				// After we have calculated the timezones we can delete user_dst column from user table.
 				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
 			}
+			
+			if (!isset($config['site_home_url']))
+			{
+				$config->set('site_home_url', '');
+				$config->set('site_home_text', '');
+			}
 
 		break;
 	}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 0bb1858c11..6b95d81713 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -240,6 +240,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_protocol',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length', '3600');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc', '{L_CONFIG_SITE_DESC}');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_home_url', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_home_text', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename', '{L_CONFIG_SITENAME}');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path', 'images/smilies');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_per_page', '50');
-- 
cgit v1.2.1


From 10172887fd47e86eefbabd6f5e755cd93279960d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 17 Jul 2012 18:48:10 +0200
Subject: [ticket/10965] Introduce a new profile field option to display no
 value

By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
---
 phpBB/install/database_update.php         | 8 ++++++++
 phpBB/install/schemas/firebird_schema.sql | 1 +
 phpBB/install/schemas/mssql_schema.sql    | 1 +
 phpBB/install/schemas/mysql_40_schema.sql | 1 +
 phpBB/install/schemas/mysql_41_schema.sql | 1 +
 phpBB/install/schemas/oracle_schema.sql   | 1 +
 phpBB/install/schemas/postgres_schema.sql | 1 +
 phpBB/install/schemas/sqlite_schema.sql   | 1 +
 8 files changed, 15 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c1fe144c62..2901bc76ee 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -995,6 +995,14 @@ function database_update_info()
 		'3.0.10-RC3'	=> array(),
 		// No changes from 3.0.10 to 3.0.11-RC1
 		'3.0.10'		=> array(),
+		// Changes from 3.0.11-RC1 to 3.0.11-RC2
+		'3.0.5'		=> array(
+			'add_columns'		=> array(
+				PROFILE_FIELDS_TABLE			=> array(
+					'field_show_novalue'		=> array('BOOL', 0),
+				),
+			),
+		),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 	);
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 73052f0a22..eae692f529 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -807,6 +807,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	field_validation VARCHAR(20) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	field_required INTEGER DEFAULT 0 NOT NULL,
+	field_show_novalue INTEGER DEFAULT 0 NOT NULL,
 	field_show_on_reg INTEGER DEFAULT 0 NOT NULL,
 	field_show_on_vt INTEGER DEFAULT 0 NOT NULL,
 	field_show_profile INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 8ed3ba7e12..0b2f8368de 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -974,6 +974,7 @@ CREATE TABLE [phpbb_profile_fields] (
 	[field_default_value] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[field_validation] [varchar] (20) DEFAULT ('') NOT NULL ,
 	[field_required] [int] DEFAULT (0) NOT NULL ,
+	[field_show_novalue] [int] DEFAULT (0) NOT NULL ,
 	[field_show_on_reg] [int] DEFAULT (0) NOT NULL ,
 	[field_show_on_vt] [int] DEFAULT (0) NOT NULL ,
 	[field_show_profile] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 42b7291d9d..969cbe0472 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -571,6 +571,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value blob NOT NULL,
 	field_validation varbinary(60) DEFAULT '' NOT NULL,
 	field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	field_show_novalue tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_vt tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_profile tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 7a6d0ae188..15d34894d8 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -571,6 +571,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value varchar(255) DEFAULT '' NOT NULL,
 	field_validation varchar(20) DEFAULT '' NOT NULL,
 	field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	field_show_novalue tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_vt tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_profile tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 6e7ec31efc..af7b2b60ec 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1085,6 +1085,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value varchar2(765) DEFAULT '' ,
 	field_validation varchar2(60) DEFAULT '' ,
 	field_required number(1) DEFAULT '0' NOT NULL,
+	field_show_novalue number(1) DEFAULT '0' NOT NULL,
 	field_show_on_reg number(1) DEFAULT '0' NOT NULL,
 	field_show_on_vt number(1) DEFAULT '0' NOT NULL,
 	field_show_profile number(1) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 38f167bc7b..0a05a7cd75 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -761,6 +761,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value varchar(255) DEFAULT '' NOT NULL,
 	field_validation varchar(20) DEFAULT '' NOT NULL,
 	field_required INT2 DEFAULT '0' NOT NULL CHECK (field_required >= 0),
+	field_show_novalue INT2 DEFAULT '0' NOT NULL CHECK (field_show_novalue >= 0),
 	field_show_on_reg INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_reg >= 0),
 	field_show_on_vt INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_vt >= 0),
 	field_show_profile INT2 DEFAULT '0' NOT NULL CHECK (field_show_profile >= 0),
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index c0574244ca..be7faa4688 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -554,6 +554,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value varchar(255) NOT NULL DEFAULT '',
 	field_validation varchar(20) NOT NULL DEFAULT '',
 	field_required INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	field_show_novalue INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_show_on_reg INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_show_on_vt INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_show_profile INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
cgit v1.2.1


From 19237f561396c9a2f096c9d01acc857fe92b89ba Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 17 Jul 2012 20:28:01 +0200
Subject: [ticket/10965] Database update was referring to 3.0.5 instead of
 3.0.11-RC1

PHPBB3-10965
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2901bc76ee..c51286f25f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -996,7 +996,7 @@ function database_update_info()
 		// No changes from 3.0.10 to 3.0.11-RC1
 		'3.0.10'		=> array(),
 		// Changes from 3.0.11-RC1 to 3.0.11-RC2
-		'3.0.5'		=> array(
+		'3.0.11-RC1'	=> array(
 			'add_columns'		=> array(
 				PROFILE_FIELDS_TABLE			=> array(
 					'field_show_novalue'		=> array('BOOL', 0),
-- 
cgit v1.2.1


From 9f073e4c75cbb214eca6a4342c8a1dfe9fd9b94c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 23 Jul 2012 23:30:20 +0200
Subject: [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.

---
 phpBB/install/database_update.php     | 6 +++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c51286f25f..95b3401a7e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.11-RC1');
+define('UPDATES_TO_VERSION', '3.0.11-RC2');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -2098,6 +2098,10 @@ function change_database_data(&$no_updates, $version)
 
 			$no_updates = false;
 		break;
+
+		// No changes from 3.0.11-RC1 to 3.0.11-RC2
+		case '3.0.11-RC1':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 99b8f7f96d..cdfb4edc66 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,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.11-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-RC2');
 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');
 
-- 
cgit v1.2.1


From ed34451d5b84f2e34004f2ddbceb6b0ca5cae025 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 26 Jul 2012 17:01:55 +0200
Subject: [feature/dic] Adjust installer script to work with partially
 configured container

PHPBB3-10739
---
 phpBB/install/index.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 1ba0798abc..3c1d60f554 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -90,20 +90,14 @@ $phpbb_container = new ContainerBuilder();
 $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config'));
 $loader->load('services.yml');
 
-$processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
-$processor->process($phpbb_container);
+$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
+$phpbb_container->setParameter('core.php_ext', $phpEx);
 
-$phpbb_container->setAlias('cache.driver.install', 'cache.driver');
+$phpbb_container->setAlias('cache.driver', 'cache.driver.install');
 
 $phpbb_class_loader = $phpbb_container->get('class_loader');
 $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
-$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
-foreach ($ids as $id) {
-	$processor = $phpbb_container->get($id);
-	$processor->process($phpbb_container);
-}
-
 // set up caching
 $cache = $phpbb_container->get('cache');
 
-- 
cgit v1.2.1


From 01bc818d465ab168288e260745a045ff2794648d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 30 Jul 2012 18:44:40 -0500
Subject: [ticket/10875] Fix SQL Caching

The sql_save function cannot take arguments by reference since it is called
by call_user_func_array()

Replace use of isset($cache->sql_rowset[$query_id]) with $cache->sql_exists

Replace $cache->cache_dir with $cache->get_driver()->cache_dir

PHPBB3-10875
---
 phpBB/install/install_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index c2feaa086a..88b00f1cf1 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -349,7 +349,7 @@ class install_update extends module
 
 				// We are directly within an update. To make sure our update list is correct we check its status.
 				$update_list = ($request->variable('check_again', false, false, phpbb_request_interface::POST)) ? false : $cache->get('_update_list');
-				$modified = ($update_list !== false) ? @filemtime($cache->cache_dir . 'data_update_list.' . $phpEx) : 0;
+				$modified = ($update_list !== false) ? @filemtime($cache->get_driver()->cache_dir . 'data_update_list.' . $phpEx) : 0;
 
 				// Make sure the list is up-to-date
 				if ($update_list !== false)
-- 
cgit v1.2.1


From 484c0bec115ccb44512f69b2e927293765c79496 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Wed, 15 Aug 2012 15:44:01 +0530
Subject: [ticket/11052] constructor updated in installer and convertor

PHPBB3-11052
---
 phpBB/install/install_convert.php | 4 ++--
 phpBB/install/install_install.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index ca3994d129..b8045cb98b 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -569,7 +569,7 @@ class install_convert extends module
 	*/
 	function convert_data($sub)
 	{
-		global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache;
+		global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache, $auth;
 		global $convert, $convert_row, $message_parser, $skip_rows, $language;
 		global $request;
 
@@ -750,7 +750,7 @@ class install_convert extends module
 		}
 
 		$error = false;
-		$convert->fulltext_search = new $search_type($error);
+		$convert->fulltext_search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user);
 
 		if ($error)
 		{
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 40dee7b3d7..23593ee51f 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1427,7 +1427,7 @@ class install_install extends module
 	*/
 	function build_search_index($mode, $sub)
 	{
-		global $db, $lang, $phpbb_root_path, $phpEx, $config;
+		global $db, $lang, $phpbb_root_path, $phpEx, $config, $auth, $user;
 
 		// Obtain any submitted data
 		$data = $this->get_submitted_data();
@@ -1463,7 +1463,7 @@ class install_install extends module
 		set_config_count(null, null, null, $config);
 
 		$error = false;
-		$search = new phpbb_search_fulltext_native($error);
+		$search = new phpbb_search_fulltext_native($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user);
 
 		$sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
 			FROM ' . POSTS_TABLE;
-- 
cgit v1.2.1


From 6da03913bfcd2ac964116a42cdc7d5e7d4b4c6fd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 20 Aug 2012 16:32:34 +0200
Subject: [prep-release-3.0.11] Bumping version number for 3.0.11 final.

---
 phpBB/install/database_update.php     | 8 +++++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 95b3401a7e..b7aaefb1d0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.11-RC2');
+define('UPDATES_TO_VERSION', '3.0.11');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -1003,6 +1003,8 @@ function database_update_info()
 				),
 			),
 		),
+		// No changes from 3.0.11-RC2 to 3.0.11
+		'3.0.11-RC2'	=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 	);
@@ -2102,6 +2104,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.11-RC1 to 3.0.11-RC2
 		case '3.0.11-RC1':
 		break;
+
+		// No changes from 3.0.11-RC2 to 3.0.11
+		case '3.0.11-RC2':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index cdfb4edc66..d2d8d95b34 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,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.11-RC2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11');
 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');
 
-- 
cgit v1.2.1


From 5e6b4c7192a80dc29382ad06976e9ce6d5c16efd Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 29 Feb 2012 21:23:50 +0000
Subject: [ticket/10631] Adding an extensions admin

PHPBB3-10631
---
 phpBB/install/schemas/schema_data.sql | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index ea7864bd4c..ae7b9fcba3 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -345,6 +345,7 @@ INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_board', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_bots', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_clearlogs', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_email', 1);
+INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_extensions', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_fauth', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forum', 1);
 INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forumadd', 1);
-- 
cgit v1.2.1


From 8bbab088dd5830d8dd1151a3684dde5c197ba268 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 15:17:42 -0500
Subject: [ticket/10631] Validation for extensions

PHPBB3-10631
---
 phpBB/install/database_update.php | 4 ++--
 phpBB/install/install_install.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 502b3bb1a4..0b470ced26 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -683,12 +683,12 @@ function _write_result($no_updates, $errored, $error_ary)
 
 function _add_modules($modules_to_install)
 {
-	global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager;
+	global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager, $config;
 
 	// modules require an extension manager
 	if (empty($phpbb_extension_manager))
 	{
-		$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx");
+		$phpbb_extension_manager = new phpbb_extension_manager($db, $config, EXT_TABLE, $phpbb_root_path, ".$phpEx");
 	}
 
 	include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 23593ee51f..9162d5ab60 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -250,7 +250,7 @@ class install_install extends module
 			'S_EXPLAIN'		=> true,
 			'S_LEGEND'		=> false,
 		));
-		
+
 		// Check for php json support
 		if (@extension_loaded('json'))
 		{
@@ -1481,12 +1481,12 @@ class install_install extends module
 	*/
 	function add_modules($mode, $sub)
 	{
-		global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager;
+		global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager, $config;
 
 		// modules require an extension manager
 		if (empty($phpbb_extension_manager))
 		{
-			$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx");
+			$phpbb_extension_manager = new phpbb_extension_manager($db, $config, EXT_TABLE, $phpbb_root_path, ".$phpEx");
 		}
 
 		include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
-- 
cgit v1.2.1


From b3cd5a649be62f175de651a16ae02c5f709ca2f4 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 3 Sep 2012 13:32:33 -0500
Subject: [ticket/8713] Do not trim login inputs

Create a function to request variables which are not trimmed.

All requests for passwords (except forum passwords) now use the
untrimmed request function.

PHPBB3-8713
---
 phpBB/install/install_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 88b00f1cf1..4b5a23e497 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -862,7 +862,7 @@ class install_update extends module
 					$test_connection = false;
 					if ($test_ftp_connection || $submit)
 					{
-						$transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+						$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
 						$test_connection = $transfer->open_session();
 
 						// Make sure that the directory is correct by checking for the existence of common.php
@@ -948,7 +948,7 @@ class install_update extends module
 				}
 				else
 				{
-					$transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+					$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
 					$transfer->open_session();
 				}
 
-- 
cgit v1.2.1


From f2607fc9e80c6f9ad7543b7be5ea6f294aa6c40a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 8 Sep 2012 14:15:56 +0200
Subject: [ticket/8713] Rename untrimed_variable() to untrimmed_variable().

PHPBB3-8713
---
 phpBB/install/install_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 4b5a23e497..1ecedecce6 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -862,7 +862,7 @@ class install_update extends module
 					$test_connection = false;
 					if ($test_ftp_connection || $submit)
 					{
-						$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+						$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
 						$test_connection = $transfer->open_session();
 
 						// Make sure that the directory is correct by checking for the existence of common.php
@@ -948,7 +948,7 @@ class install_update extends module
 				}
 				else
 				{
-					$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+					$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
 					$transfer->open_session();
 				}
 
-- 
cgit v1.2.1


From cc0c378caf9bfc480391a9d11d5a4d78c0df097c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 8 Sep 2012 14:40:35 +0200
Subject: [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp)
 passwords.

PHPBB3-8713
---
 phpBB/install/install_update.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 1ecedecce6..8c044550f3 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -862,7 +862,14 @@ class install_update extends module
 					$test_connection = false;
 					if ($test_ftp_connection || $submit)
 					{
-						$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+						$transfer = new $method(
+							request_var('host', ''),
+							request_var('username', ''),
+							htmlspecialchars_decode($request->untrimmed_variable('password', '')),
+							request_var('root_path', ''),
+							request_var('port', ''),
+							request_var('timeout', '')
+						);
 						$test_connection = $transfer->open_session();
 
 						// Make sure that the directory is correct by checking for the existence of common.php
@@ -948,7 +955,14 @@ class install_update extends module
 				}
 				else
 				{
-					$transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+					$transfer = new $method(
+						request_var('host', ''),
+						request_var('username', ''),
+						htmlspecialchars_decode($request->untrimmed_variable('password', '')),
+						request_var('root_path', ''),
+						request_var('port', ''),
+						request_var('timeout', '')
+					);
 					$transfer->open_session();
 				}
 
-- 
cgit v1.2.1


From 503989979a2e6a7fb9d64ed249b09a0bef2b2f95 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 13 Sep 2012 16:44:26 -0400
Subject: [ticket/11086] Fix database_update.php to use Dependency Injection
 Container

PHPBB3-11086
---
 phpBB/install/database_update.php | 47 ++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 13 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0b470ced26..323ba0c876 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -7,6 +7,10 @@
 *
 */
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
 define('UPDATES_TO_VERSION', '3.1.0-dev');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
@@ -107,21 +111,38 @@ if (!defined('EXT_TABLE'))
 	define('EXT_TABLE', $table_prefix . 'ext');
 }
 
-$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
-$phpbb_class_loader_ext->register();
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
-$phpbb_class_loader->register();
+$phpbb_container = new ContainerBuilder();
+$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config'));
+$loader->load('services.yml');
+
+// We must include the DI processor class files because the class loader
+// is not yet set up
+require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx);
+require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx);
+
+$processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
+$processor->process($phpbb_container);
+
+// Setup class loader first
+$phpbb_class_loader = $phpbb_container->get('class_loader');
+$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
+
+$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
+foreach ($ids as $id)
+{
+	$processor = $phpbb_container->get($id);
+	$processor->process($phpbb_container);
+}
 
 // set up caching
-$cache_factory = new phpbb_cache_factory($acm_type);
-$cache = $cache_factory->get_service();
-$phpbb_class_loader_ext->set_cache($cache->get_driver());
-$phpbb_class_loader->set_cache($cache->get_driver());
-
-$phpbb_dispatcher = new phpbb_event_dispatcher();
-$request = new phpbb_request();
-$user = new phpbb_user();
-$db = new $sql_db();
+$cache = $phpbb_container->get('cache');
+
+// Instantiate some basic classes
+$phpbb_dispatcher = $phpbb_container->get('dispatcher');
+$request	= $phpbb_container->get('request');
+$user		= $phpbb_container->get('user');
+$auth		= $phpbb_container->get('auth');
+$db			= $phpbb_container->get('dbal.conn');
 
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
-- 
cgit v1.2.1


From 298fa894e7ea0807a295cd0ed55cabef8a27a3f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 13 Sep 2012 16:56:09 -0400
Subject: [ticket/11086] Move DI processing below $request definition

As per PR #991 (ticket/11101).

PHPBB3-11086
---
 phpBB/install/database_update.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 323ba0c876..5fa6166913 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -119,7 +119,6 @@ $loader->load('services.yml');
 // is not yet set up
 require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx);
 require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx);
-
 $processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
 $processor->process($phpbb_container);
 
@@ -127,13 +126,6 @@ $processor->process($phpbb_container);
 $phpbb_class_loader = $phpbb_container->get('class_loader');
 $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
-$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
-foreach ($ids as $id)
-{
-	$processor = $phpbb_container->get($id);
-	$processor->process($phpbb_container);
-}
-
 // set up caching
 $cache = $phpbb_container->get('cache');
 
@@ -144,6 +136,13 @@ $user		= $phpbb_container->get('user');
 $auth		= $phpbb_container->get('auth');
 $db			= $phpbb_container->get('dbal.conn');
 
+$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
+foreach ($ids as $id)
+{
+	$processor = $phpbb_container->get($id);
+	$processor->process($phpbb_container);
+}
+
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
 
-- 
cgit v1.2.1


From 95d02d74ac6d71578a98e8850140d9a6cad7e852 Mon Sep 17 00:00:00 2001
From: Vinny <vinny@suportephpbb.com.br>
Date: Fri, 5 Oct 2012 21:18:59 -0300
Subject: [ticket/11135] Full replacement of credit link to https

PHPBB3-11135
---
 phpBB/install/convertors/convert_phpbb20.php | 2 +-
 phpBB/install/database_update.php            | 2 +-
 phpBB/install/index.php                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 7d6fed6164..960cc5b335 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -33,7 +33,7 @@ $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
 	'phpbb_version'	=> '3.0.11',
-	'author'		=> '<a href="http://www.phpbb.com/">phpBB Group</a>',
+	'author'		=> '<a href="https://www.phpbb.com/">phpBB Group</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
 	'dbport'		=> $dbport,
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 5a186d0eeb..40837145ba 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -527,7 +527,7 @@ function _print_footer()
 	</div>
 
 	<div id="page-footer">
-		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+		Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 	</div>
 </div>
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 5135e2dbd8..ad46e273c2 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -569,7 +569,7 @@ class module
 		echo '		</div>';
 		echo '	</div>';
 		echo '	<div id="page-footer">';
-		echo '		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group';
+		echo '		Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group';
 		echo '	</div>';
 		echo '</div>';
 		echo '</body>';
-- 
cgit v1.2.1


From 5f5d395c625fe0257e7bca5d787424808f7649cc Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 29 Oct 2012 13:58:24 -0400
Subject: [ticket/11158] Require acl_u_sig for ucp signature module.

PHPBB3-11158
---
 phpBB/install/database_update.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'phpBB/install')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 40837145ba..099ab6aeb5 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1005,6 +1005,8 @@ function database_update_info()
 		),
 		// No changes from 3.0.11-RC2 to 3.0.11
 		'3.0.11-RC2'	=> array(),
+		// No changes from 3.0.11 to 3.0.12-RC1
+		'3.0.11'		=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 	);
@@ -2108,6 +2110,16 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.11-RC2 to 3.0.11
 		case '3.0.11-RC2':
 		break;
+
+		// Changes from 3.0.11 to 3.0.12-RC1
+		case '3.0.11':
+			$sql = 'UPDATE ' . MODULES_TABLE . '
+				SET module_auth = \'acl_u_sig\'
+				WHERE module_class = \'ucp\'
+					AND module_basename = \'profile\'
+					AND module_mode = \'signature\'';
+			_sql($sql, $errored, $error_ary);
+		break;
 	}
 }
 
-- 
cgit v1.2.1


From 767d09227bd848da21dc3e255b1dacd20cbad1f7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 2 Nov 2012 18:51:35 -0400
Subject: [ticket/10933] Dependency inject template context.

PHPBB3-10933
---
 phpBB/install/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 4f1fbee7ad..f71e5ada54 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -213,7 +213,7 @@ $config = new phpbb_config(array(
 
 $phpbb_style_resource_locator = new phpbb_style_resource_locator();
 $phpbb_style_path_provider = new phpbb_style_path_provider();
-$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator);
+$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, new phpbb_template_context());
 $phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
 $phpbb_style->set_ext_dir_prefix('adm/');
 $phpbb_style->set_custom_style('admin', '../adm/style', '');
-- 
cgit v1.2.1