- We are now at _seven_ different policies, not counting the non-GD version. We must remove something...

- Made the CAPTCHA system idiot proof, disabling all the policies still lets an image get created.
- We handle the case of a user having GD but no TTF. Thankfully, we have CAPTCHAs that don't need TTF!
- Fixed that stupid language string...
- Renamed Occlude to Overlap
- Shape is now only enabled if TTF support is detected


git-svn-id: file:///svn/phpbb/trunk@5985 89ea8834-ac86-4346-8a33-228a782c2dd0

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));