aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-06-12 11:06:52 +0200
committerNils Adermann <naderman@naderman.de>2011-06-12 11:10:18 +0200
commitcd3d23810f844b529f304cb7062ffe65cc17e4e3 (patch)
tree0981ac635ede4849c4c4c0a855a62eccadaf5fbf
parent6cab45b28e5c30571ce6f2961e26d268fb6542e7 (diff)
downloadforums-cd3d23810f844b529f304cb7062ffe65cc17e4e3.tar
forums-cd3d23810f844b529f304cb7062ffe65cc17e4e3.tar.gz
forums-cd3d23810f844b529f304cb7062ffe65cc17e4e3.tar.bz2
forums-cd3d23810f844b529f304cb7062ffe65cc17e4e3.tar.xz
forums-cd3d23810f844b529f304cb7062ffe65cc17e4e3.zip
[ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config
PHPBB3-9892
-rw-r--r--phpBB/install/database_update.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7cf3b02e9f..7d7572b204 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1913,16 +1913,13 @@ function change_database_data(&$no_updates, $version)
}
$db->sql_freeresult($result);
- global $db_tools;
+ global $db_tools, $table_prefix;
// Recover from potentially broken Q&A CAPTCHA table on firebird
+ // Q&A CAPTCHA was uninstallable, so it's safe to remove these
+ // without data loss
if ($db_tools->sql_layer == 'firebird')
{
- if ($config['captcha_plugin'] == 'phpbb_captcha_qa')
- {
- setconfig('captcha_plugin', 'phpbb_captcha_nogd');
- }
-
$tables = array(
$table_prefix . 'captcha_questions',
$table_prefix . 'captcha_answers',