Commit fb17f587 authored by Evan Goldenberg's avatar Evan Goldenberg
Browse files

replace a database upgrade that changed captcha settings



This was removed as part of preparation for anti-spam, but it was later
decided that old upgrades should always be left untouched. Instead, this
commit adds an additional upgrade that removes the relevant settings
from the database.
Signed-off-by: default avatarEvan Goldenberg <evang@catalyst.net.nz>
parent 9a27c8b6
......@@ -1194,6 +1194,13 @@ function xmldb_core_upgrade($oldversion=0) {
drop_field($table, $field);
}
if ($oldversion < 2009082600) {
$captcha = get_config('captcha_on_contact_form');
set_config('captchaoncontactform', (int) (is_null($captcha) || $captcha));
$captcha = get_config('captcha_on_register_form');
set_config('captchaonregisterform', (int) (is_null($captcha) || $captcha));
}
if ($oldversion < 2009090700) {
set_config('showselfsearchsideblock', 1);
set_config('showtagssideblock', 1);
......@@ -1371,5 +1378,11 @@ function xmldb_core_upgrade($oldversion=0) {
execute_sql('ALTER TABLE {view} ADD COLUMN submittedtime TIMESTAMP');
}
if ($oldversion < 2010041200) {
delete_records('config', 'field', 'captchaoncontactform');
delete_records('config', 'field', 'captchaonregisterform');
}
return $status;
}
......@@ -28,7 +28,7 @@
defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2010040800;
$config->version = 2010041200;
$config->release = '1.3.0dev';
$config->minupgradefrom = 2008040200;
$config->minupgraderelease = '1.0.0 (release tag 1.0.0_RELEASE)';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment