From c3c8cc40bea641f27afa7b9fcd66c3b9f9065c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Sun, 1 Apr 2018 16:42:14 +0200
Subject: [PATCH] MDL-39035 admin: show old and new version after upgrade in
 CLI

---
 admin/cli/upgrade.php | 9 +++++----
 lang/en/admin.php     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/admin/cli/upgrade.php b/admin/cli/upgrade.php
index 6c10b9a74426f..5915e24ea0346 100644
--- a/admin/cli/upgrade.php
+++ b/admin/cli/upgrade.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
diff --git a/lang/en/admin.php b/lang/en/admin.php
index a2344f010cadc..207dbc297e79c 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -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';