Skip to content

Commit

Permalink
Merge branch 'MDL-39035-master' of https://github.com/lucaboesch/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed Apr 16, 2018
2 parents 82f0ddc + c3c8cc4 commit 99719b6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions admin/cli/upgrade.php
Expand Up @@ -131,10 +131,11 @@
cli_error(get_string('pluginschecktodo', 'admin'));
}

$a = new stdClass();
$a->oldversion = $oldversion;
$a->newversion = $newversion;

if ($interactive) {
$a = new stdClass();
$a->oldversion = $oldversion;
$a->newversion = $newversion;
echo cli_heading(get_string('databasechecking', '', $a)) . PHP_EOL;
}

Expand Down Expand Up @@ -193,5 +194,5 @@
// to immediately start browsing the site.
upgrade_themes();

echo get_string('cliupgradefinished', 'admin')."\n";
echo get_string('cliupgradefinished', 'admin', $a)."\n";
exit(0); // 0 means success
2 changes: 1 addition & 1 deletion lang/en/admin.php
Expand Up @@ -128,7 +128,7 @@
$string['cliunknowoption'] = 'Unrecognised options:
{$a}
Please use --help option.';
$string['cliupgradefinished'] = 'Command line upgrade completed successfully.';
$string['cliupgradefinished'] = 'Command line upgrade from {$a->oldversion} to {$a->newversion} completed successfully.';
$string['cliupgradenoneed'] = 'No upgrade needed for the installed version {$a}. Thanks for coming anyway!';
$string['cliyesnoprompt'] = 'type y (means yes) or n (means no)';
$string['commentsperpage'] = 'Comments displayed per page';
Expand Down

0 comments on commit 99719b6

Please sign in to comment.