Permalink
Browse files

Merge branch 'MDL-39035-master' of https://github.com/lucaboesch/moodle

  • Loading branch information...
dmonllao committed Apr 16, 2018
2 parents 82f0ddc + c3c8cc4 commit 99719b6e891e166f26eb81a7e95df98dedb7e569
Showing with 6 additions and 5 deletions.
  1. +5 −4 admin/cli/upgrade.php
  2. +1 −1 lang/en/admin.php
@@ -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;
}
@@ -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
@@ -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';

0 comments on commit 99719b6

Please sign in to comment.