5 files changed, 2 insertions, 23 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 613afa728c..d43d0f529a 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -273,9 +273,6 @@ $config = array(
 $template->set_custom_template('../adm/style', 'admin');
 $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.' . PHP_EXT, $mode, $sub);
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index a95cfbaae3..b2bf0fb37f 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1955,7 +1955,7 @@ class install_install extends module
 			'TITLE'		=> $lang['INSTALL_CONGRATS'],
 			'BODY'		=> sprintf($lang['INSTALL_CONGRATS_EXPLAIN'], $config['version'], append_sid('install/index', 'mode=convert&amp;language=' . $data['language']), '../docs/README.html'),
 			'L_SUBMIT'	=> $lang['INSTALL_LOGIN'],
-			'U_ACTION'	=> append_sid(CONFIG_ADM_FOLDER . '/index'),
+			'U_ACTION'	=> append_sid('adm/index'),
 		));
 	}
 
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 5a4f612a45..33a706edf1 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -128,9 +128,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;
-
 		// Get current and latest version
 		if (($latest_version = $cache->get('_version_info')) === false)
 		{
diff --git a/phpBB/install/schemas/schema_data.php b/phpBB/install/schemas/schema_data.php
index 53bd638066..9f505ba3d3 100644
--- a/phpBB/install/schemas/schema_data.php
+++ b/phpBB/install/schemas/schema_data.php
@@ -808,7 +808,6 @@ $schema_data['phpbb_styles_template'] = array(
 		'template_copyright'	=> array('VCHAR_UNI', ''),
 		'template_path'			=> array('VCHAR:100', ''),
 		'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-		'template_storedb'		=> array('BOOL', 0),
 	),
 	'PRIMARY_KEY'	=> 'template_id',
 	'KEYS'			=> array(
@@ -816,20 +815,6 @@ $schema_data['phpbb_styles_template'] = array(
 	),
 );
 
-$schema_data['phpbb_styles_template_data'] = array(
-	'COLUMNS'		=> array(
-		'template_id'			=> array('USINT', 0),
-		'template_filename'		=> array('VCHAR:100', ''),
-		'template_included'		=> array('TEXT', ''),
-		'template_mtime'		=> array('TIMESTAMP', 0),
-		'template_data'			=> array('MTEXT_UNI', ''),
-	),
-	'KEYS'			=> array(
-		'tid'					=> array('INDEX', 'template_id'),
-		'tfn'					=> array('INDEX', 'template_filename'),
-	),
-);
-
 $schema_data['phpbb_styles_theme'] = array(
 	'COLUMNS'		=> array(
 		'theme_id'				=> array('USINT', NULL, 'auto_increment'),
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index e59fa69583..15f2eb1a0e 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -467,7 +467,7 @@ INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang,
 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);
 
 # -- 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, '');