Commit 661a87bd authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Remove duplicate activity_type record created by earlier upgrade


Signed-off-by: default avatarRichard Mansfield <richardm@catalyst.net.nz>
parent 82e5d426
......@@ -1298,6 +1298,17 @@ function xmldb_core_upgrade($oldversion=0) {
add_field($table, $field);
}
if ($oldversion < 2009120100) {
// Fix for bug in 1.1 => 1.2 upgrade which may have inserted
// a second groupmessage activity_type record
$records = get_records_select_array('activity_type', 'name = ? AND plugintype IS NULL AND pluginname IS NULL', array('groupmessage'));
if ($records && count($records) > 1) {
for ($i = 1; $i < count($records); $i++) {
delete_records('activity_type', 'id', $records[$i]->id);
}
}
}
return $status;
}
......
......@@ -28,7 +28,7 @@
defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2009111201;
$config->version = 2009120100;
$config->release = '1.2.0rc2dev';
$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