2 files changed, 13 insertions, 18 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 36f99db0d3..df834a367e 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1185,12 +1185,12 @@ class install_install extends module
 				SET forum_last_post_time = $current_time", 
 		);
 
-		// This is for people who have TTF disabled
-		if (!(@function_exists('imagettfbbox') && @function_exists('imagettftext')))
+		// This is for people who have TTF and GD
+		if (@extension_loaded('gd') && function_exists('imagettfbbox') && function_exists('imagettftext'))
 		{
 			$sql_ary[] = 'UPDATE ' . $table_prefix . "config
-					SET config_value = '0'
-					WHERE config_name = 'policy_shape'";
+					SET config_value = '1'
+					WHERE config_name = 'captcha_gd'";
 		}
 
 		foreach ($sql_ary as $sql)
@@ -1732,11 +1732,17 @@ class install_install extends module
 			{
 				case 'mysql':
 				case 'mysqli':
-				case 'sqlite':
 					$sql = 'SHOW TABLES';
 					$field = "Tables_in_{$dbname}";
 				break;
 
+				case 'sqlite':
+					$sql = 'SELECT name
+						FROM sqlite_master
+						WHERE type = "table"';
+					$field = 'name';
+				break;
+
 				case 'mssql':
 				case 'mssql_odbc':
 					$sql = "SELECT name 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index e7785f5d62..82a6608ae6 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -163,19 +163,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', '.*
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes', '4');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_msgs', '50');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_overlap', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_overlap_noise_pixel', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_overlap_noise_line', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_entropy', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_entropy_noise_pixel', '2');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_entropy_noise_line', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_shape', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_shape_noise_pixel', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_shape_noise_line', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_3dbitmap', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_cells', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_stencil', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_composite', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_noise', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page', '10');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('print_pm', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('queue_interval', '600');