mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 16:40:07 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Monllao 2018-04-16 12:57:34 +02:00
commit 99719b6e89
2 changed files with 6 additions and 5 deletions
admin/cli
upgrade.php
lang/en
admin.php

9
admin/cli/upgrade.php

@ -131,10 +131,11 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
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 @@ admin_apply_default_settings(NULL, false);
// 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
lang/en/admin.php

@ -128,7 +128,7 @@ $string['clitypevaluedefault'] = 'type value, press Enter to use default value (
$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';