Commit b04d7080 authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review

Merge "CLI upgrader, better handling of out-of-sequence plugin upgrades"

parents 07b0254d 0e1704c1
......@@ -47,4 +47,9 @@ ensure_upgrade_sanity();
// Actually perform the upgrade
log_info(get_string('cliupgradingmahara', 'admin'));
upgrade_mahara($upgrades);
foreach ($upgrades as $name => $data) {
// Check to make sure the plugin hasn't already been update out-of-sequence
if ($name != 'settings' && $newdata = check_upgrades($name)) {
upgrade_mahara(array($name => $newdata));
}
}
......@@ -207,6 +207,7 @@ function ensure_upgrade_sanity() {
/**
* Upgrade/Install the specified mahara components
* (Only used by the CLI installer & upgrader)
*
* @param array $upgrades The list of components to install or upgrade
* @return void
......
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