3 files changed, 15 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c66ac859cf..fe855496e4 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.5';
+$updates_to_version = '3.0.6-dev';
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
@@ -677,6 +677,9 @@ function database_update_info()
 
 		// No changes from 3.0.5-RC1 to 3.0.5
 		'3.0.5-RC1'		=> array(),
+		
+		// No changes from 3.0.5
+		'3.0.5'		=> array(),
 	);
 }
 
@@ -1012,6 +1015,14 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.5-RC1 to 3.0.5
 		case '3.0.5-RC1':
 		break;
+		
+		
+				 
+		case '3.0.5':
+			// TODO: smarter detection here; problem without GD.
+			set_config('captcha_plugin', 'phpbb_captcha_nogd');
+
+		break;
 	}
 }
 
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index adb0fb9623..5ce18b37cd 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1373,8 +1373,8 @@ class install_install extends module
 		if (@extension_loaded('gd') || can_load_dll('gd'))
 		{
 			$sql_ary[] = 'UPDATE ' . $data['table_prefix'] . "config
-				SET config_value = '1'
-				WHERE config_name = 'captcha_gd'";
+				SET config_value = 'phpbb_captcha_gd'
+				WHERE config_name = 'captcha_plugin'";
 		}
 
 		$ref = substr($referer, strpos($referer, '://') + 3);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 8b6c6d7189..e41cf6794c 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -60,7 +60,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_interval', '10');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_type', 'd');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cache_gc', '7200');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_plugin', 'phpbb_captcha_nogd');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_foreground_noise', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_x_grid', '25');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_y_grid', '25');