diff --git a/admin/cli/upgrade.php b/admin/cli/upgrade.php index 6c10b9a7442..5915e24ea03 100644 --- a/admin/cli/upgrade.php +++ b/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 diff --git a/lang/en/admin.php b/lang/en/admin.php index a2344f010ca..207dbc297e7 100644 --- a/lang/en/admin.php +++ b/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';