From 91f809dc3dc926ff858e5e53ee8cfed781c1aeaa Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Tue, 2 Feb 2016 16:09:40 +0100
Subject: [ticket/14262] Add error handling and small CS fixes

PHPBB3-14262
---
 phpBB/install/convert/convert.php   |  4 ++--
 phpBB/install/convert/convertor.php | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'phpBB/install/convert')

diff --git a/phpBB/install/convert/convert.php b/phpBB/install/convert/convert.php
index d12059fe29..03913d6ae6 100644
--- a/phpBB/install/convert/convert.php
+++ b/phpBB/install/convert/convert.php
@@ -53,8 +53,8 @@ class convert
 
 	var $p_master;
 
-	function convert(&$p_master)
+	function convert($p_master)
 	{
-		$this->p_master = &$p_master;
+		$this->p_master = $p_master;
 	}
 }
diff --git a/phpBB/install/convert/convertor.php b/phpBB/install/convert/convertor.php
index 8dbc38f303..2dae356c26 100644
--- a/phpBB/install/convert/convertor.php
+++ b/phpBB/install/convert/convertor.php
@@ -1591,9 +1591,10 @@ class convertor
 	 */
 	public function error($error, $line, $file, $skip = false)
 	{
-		//
-		// @todo
-		//
+		$this->template->assign_block_vars('errors', array(
+			'TITLE'	=> $error,
+			'DESCRIPTION' => 'In ' . $file . ' on line ' . $line,
+		));
 	}
 
 	/**
@@ -1609,8 +1610,9 @@ class convertor
 	 */
 	public function db_error($error, $sql, $line, $file, $skip = false)
 	{
-		//
-		// @todo
-		//
+		$this->template->assign_block_vars('errors', array(
+			'TITLE'	=> $error,
+			'DESCRIPTION' => 'In ' . $file . ' on line ' . $line . '<br /><br /><strong>SQL:</strong> ' . $sql,
+		));
 	}
 }
-- 
cgit v1.2.1