Commit 8354c654 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Count "core" and "local" in the "toupgradecount" for check_upgrades()"

parents f6523977 636c5ad2
......@@ -92,6 +92,7 @@ function check_upgrades($name=null) {
. "($config->minupgraderelease) first "
. " (you have $coreversion ($corerelease)");
}
$toupgradecount ++;
$core->upgrade = true;
$core->from = $coreversion;
$core->fromrelease = $corerelease;
......@@ -120,6 +121,7 @@ function check_upgrades($name=null) {
require(get_config('docroot') . 'local/version.php');
if ($config->version > $localversion) {
$toupgradecount ++;
$toupgrade['local'] = (object) array(
'upgrade' => true,
'from' => $localversion,
......@@ -271,7 +273,7 @@ function check_upgrades($name=null) {
. " ($config->minupgraderelease) first "
. " (you have $pluginversion ($pluginrelease))");
}
$toupgradecount ++;
$toupgradecount++;
$plugininfo = new StdClass;
$plugininfo->upgrade = true;
$plugininfo->from = $pluginversion;
......
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