Commit 4e257374 authored by Evan Goldenberg's avatar Evan Goldenberg
Browse files

re-order upgrades



The antispam feature was developed long before being merged, so it's db
upgrade had a lower version than the current HEAD of master. This
rearranges things so that people who have been using master get all the
upgrades.
Signed-off-by: default avatarEvan Goldenberg <evang@catalyst.net.nz>
parent 707d06d8
......@@ -1351,19 +1351,6 @@ function xmldb_core_upgrade($oldversion=0) {
set_remoteavatars_default();
}
if ($oldversion < 2010022500) {
set_config('formsecret', get_random_key());
require_once(get_config('docroot') . 'lib/antispam.php');
if(checkdnsrr('test.uribl.com.black.uribl.com', 'A')) {
set_config('antispam', 'advanced');
}
else {
set_config('antispam', 'simple');
}
set_config('spamhaus', 0);
set_config('surbl', 0);
}
if ($oldversion < 2010031000) {
// For existing sites, preserve current user search behaviour:
// Users are only searchable by their display names.
......@@ -1376,5 +1363,18 @@ function xmldb_core_upgrade($oldversion=0) {
");
}
if ($oldversion < 2010040700) {
set_config('formsecret', get_random_key());
require_once(get_config('docroot') . 'lib/antispam.php');
if(checkdnsrr('test.uribl.com.black.uribl.com', 'A')) {
set_config('antispam', 'advanced');
}
else {
set_config('antispam', 'simple');
}
set_config('spamhaus', 0);
set_config('surbl', 0);
}
return $status;
}
......@@ -28,7 +28,7 @@
defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2010031000;
$config->version = 2010040700;
$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