4 files changed, 17 insertions, 86 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 80d6e05d09..4088657743 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1528,6 +1528,7 @@ function get_schema_struct()
 			'report_closed'			=> array('BOOL', 0),
 			'report_time'			=> array('TIMESTAMP', 0),
 			'report_text'			=> array('MTEXT_UNI', ''),
+			'reported_post_text'	=> array('MTEXT_UNI', ''),
 		),
 		'PRIMARY_KEY'	=> 'report_id',
 		'KEYS'			=> array(
@@ -1654,43 +1655,14 @@ function get_schema_struct()
 			'style_name'			=> array('VCHAR_UNI:255', ''),
 			'style_copyright'		=> array('VCHAR_UNI', ''),
 			'style_active'			=> array('BOOL', 1),
-			'template_id'			=> array('UINT', 0),
-			'theme_id'				=> array('UINT', 0),
+			'style_path'			=> array('VCHAR:100', ''),
+			'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+			'style_parent_id'		=> array('UINT:4', 0),
+			'style_parent_tree'		=> array('TEXT', ''),
 		),
 		'PRIMARY_KEY'	=> 'style_id',
 		'KEYS'			=> array(
 			'style_name'		=> array('UNIQUE', 'style_name'),
-			'template_id'		=> array('INDEX', 'template_id'),
-			'theme_id'			=> array('INDEX', 'theme_id'),
-		),
-	);
-
-	$schema_data['phpbb_styles_template'] = array(
-		'COLUMNS'		=> array(
-			'template_id'			=> array('UINT', NULL, 'auto_increment'),
-			'template_name'			=> array('VCHAR_UNI:255', ''),
-			'template_copyright'	=> array('VCHAR_UNI', ''),
-			'template_path'			=> array('VCHAR:100', ''),
-			'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-			'template_inherits_id'		=> array('UINT:4', 0),
-			'template_inherit_path'		=> array('VCHAR', ''),
-		),
-		'PRIMARY_KEY'	=> 'template_id',
-		'KEYS'			=> array(
-			'tmplte_nm'				=> array('UNIQUE', 'template_name'),
-		),
-	);
-
-	$schema_data['phpbb_styles_theme'] = array(
-		'COLUMNS'		=> array(
-			'theme_id'				=> array('UINT', NULL, 'auto_increment'),
-			'theme_name'			=> array('VCHAR_UNI:255', ''),
-			'theme_copyright'		=> array('VCHAR_UNI', ''),
-			'theme_path'			=> array('VCHAR:100', ''),
-		),
-		'PRIMARY_KEY'	=> 'theme_id',
-		'KEYS'			=> array(
-			'theme_name'		=> array('UNIQUE', 'theme_name'),
 		),
 	);
 
diff --git a/phpBB/develop/create_search_index.php b/phpBB/develop/create_search_index.php
index 1de20f3099..f329b805a0 100644
--- a/phpBB/develop/create_search_index.php
+++ b/phpBB/develop/create_search_index.php
@@ -35,7 +35,6 @@ $search_errors = array();
 $search = new $class_name($search_errors);
 
 $batch_size = isset($argv[2]) ? $argv[2] : 2000;
-$time = time();
 
 if (method_exists($search, 'create_index'))
 {
@@ -67,6 +66,7 @@ else
 	while ($post_counter <= $max_post_id)
 	{
 		$row_count = 0;
+		$time = time();
 
 		printf("Processing posts with %d <= post_id <= %d\n",
 			$post_counter + 1,
diff --git a/phpBB/develop/extensions.php b/phpBB/develop/extensions.php
index 2f7c3d1167..43621f3080 100644
--- a/phpBB/develop/extensions.php
+++ b/phpBB/develop/extensions.php
@@ -37,6 +37,13 @@ function list_extensions()
 	global $phpbb_extension_manager;
 
 	$phpbb_extension_manager->load_extensions();
+	$all = array_keys($phpbb_extension_manager->all_available());
+
+	if (empty($all))
+	{
+		echo "There were no extensions found.\n";
+		exit(3);
+	}
 
 	echo "Enabled:\n";
 	$enabled = array_keys($phpbb_extension_manager->all_enabled());
@@ -49,7 +56,6 @@ function list_extensions()
 	echo "\n";
 
 	echo "Available:\n";
-	$all = array_keys($phpbb_extension_manager->all_available());
 	$purged = array_diff($all, $enabled, $disabled);
 	print_extensions($purged);
 }
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 69fcd690b7..88596e9461 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -1091,61 +1091,14 @@ function get_schema_struct()
 			'style_name'			=> array('VCHAR_UNI:255', ''),
 			'style_copyright'		=> array('VCHAR_UNI', ''),
 			'style_active'			=> array('BOOL', 1),
-			'template_id'			=> array('UINT', 0),
-			'theme_id'				=> array('UINT', 0),
+			'style_path'			=> array('VCHAR:100', ''),
+			'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+			'style_parent_id'		=> array('UINT:4', 0),
+			'style_parent_tree'		=> array('TEXT', ''),
 		),
 		'PRIMARY_KEY'	=> 'style_id',
 		'KEYS'			=> array(
 			'style_name'		=> array('UNIQUE', 'style_name'),
-			'template_id'		=> array('INDEX', 'template_id'),
-			'theme_id'			=> array('INDEX', 'theme_id'),
-		),
-	);
-
-	$schema_data['phpbb_styles_template'] = array(
-		'COLUMNS'		=> array(
-			'template_id'			=> array('UINT', NULL, 'auto_increment'),
-			'template_name'			=> array('VCHAR_UNI:255', ''),
-			'template_copyright'	=> array('VCHAR_UNI', ''),
-			'template_path'			=> array('VCHAR:100', ''),
-			'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-			'template_storedb'		=> array('BOOL', 0),
-			'template_inherits_id'		=> array('UINT:4', 0),
-			'template_inherit_path'		=> array('VCHAR', ''),
-		),
-		'PRIMARY_KEY'	=> 'template_id',
-		'KEYS'			=> array(
-			'tmplte_nm'				=> array('UNIQUE', 'template_name'),
-		),
-	);
-
-	$schema_data['phpbb_styles_template_data'] = array(
-		'COLUMNS'		=> array(
-			'template_id'			=> array('UINT', 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('UINT', NULL, 'auto_increment'),
-			'theme_name'			=> array('VCHAR_UNI:255', ''),
-			'theme_copyright'		=> array('VCHAR_UNI', ''),
-			'theme_path'			=> array('VCHAR:100', ''),
-			'theme_storedb'			=> array('BOOL', 0),
-			'theme_mtime'			=> array('TIMESTAMP', 0),
-			'theme_data'			=> array('MTEXT_UNI', ''),
-		),
-		'PRIMARY_KEY'	=> 'theme_id',
-		'KEYS'			=> array(
-			'theme_name'		=> array('UNIQUE', 'theme_name'),
 		),
 	);