2 files changed, 14 insertions, 3 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 2085d5b9dd..ae3048122c 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1084,6 +1084,14 @@ 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')))
+		{
+			$sql_ary[] = 'UPDATE ' . $table_prefix . "config
+					SET config_value = '0'
+					WHERE config_name = 'policy_shape'";
+		}
+
 		foreach ($sql_ary as $sql)
 		{
 			$sql = trim(str_replace('|', ';', $sql));
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index cf50db3f13..3e99ec3508 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -162,9 +162,9 @@ 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_occlude', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_occlude_noise_pixel', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_occlude_noise_line', '1');
+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');
@@ -172,6 +172,9 @@ 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 ('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');