2 files changed, 51 insertions, 22 deletions
diff --git a/phpBB/phpbb/db/html_migrator_output_handler.php b/phpBB/phpbb/db/html_migrator_output_handler.php
new file mode 100644
index 0000000000..6812498f1f
--- /dev/null
+++ b/phpBB/phpbb/db/html_migrator_output_handler.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db;
+
+use phpbb\user;
+
+class html_migrator_output_handler extends migrator_output_handler
+{
+	/**
+	 * User object.
+	 *
+	 * @var user
+	 */
+	private $user;
+
+	/**
+	 * Constructor
+	 *
+	 * @param user $user	User object
+	 */
+	public function __construct(user $user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * Write output using the configured closure.
+	 *
+	 * @param string|array $message The message to write or an array containing the language key and all of its parameters.
+	 * @param int $verbosity The verbosity of the message.
+	 */
+	public function write($message, $verbosity)
+	{
+		if ($verbosity <= migrator_output_handler::VERBOSITY_NORMAL)
+		{
+			$final_message = call_user_func_array(array($this->user, 'lang'), $message);
+			echo $final_message . "<br />\n";
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migrator_output_handler.php b/phpBB/phpbb/db/migrator_output_handler.php
index 5e011bc45b..14d5b7890a 100644
--- a/phpBB/phpbb/db/migrator_output_handler.php
+++ b/phpBB/phpbb/db/migrator_output_handler.php
@@ -22,26 +22,6 @@ class migrator_output_handler
 	const VERBOSITY_DEBUG        = 4;
 
 	/**
-	 * A callable used to write the output.
-	 *
-	 * @var callable
-	 */
-	private $closure;
-
-	/**
-	 * Constructor
-	 *
-	 * @param callable $closure The closure used to write the output. (null by default)
-	 */
-	public function __construct(\Closure $closure = null)
-	{
-		if ($closure === null) {
-			$closure = function($message, $verbosity) {};
-		}
-		$this->closure = $closure;
-	}
-
-	/**
 	 * Write output using the configured closure.
 	 *
 	 * @param string|array $message The message to write or an array containing the language key and all of its parameters.
@@ -49,7 +29,5 @@ class migrator_output_handler
 	 */
 	public function write($message, $verbosity)
 	{
-		$closure = $this->closure;
-		$closure((array) $message, $verbosity);
 	}
 }