From c53ce3d5fbfcdc9924426aee74fb1097138a8a42 Mon Sep 17 00:00:00 2001
From: CHItA <mate.bartus@gmail.com>
Date: Wed, 17 Jun 2015 11:00:07 +0200
Subject: [ticket/13740] Fix CS and extend phpbb extensions

[ci skip]

PHPBB3-13740
---
 phpBB/phpbb/install/installer.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'phpBB/phpbb/install/installer.php')

diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php
index f5da898a00..d64713e6a3 100644
--- a/phpBB/phpbb/install/installer.php
+++ b/phpBB/phpbb/install/installer.php
@@ -229,17 +229,18 @@ class installer
 		}
 		catch (invalid_service_name_exception $e)
 		{
-			if ($e->has_params())
+			$params = $e->get_parameters();
+
+			if (!empty($params))
 			{
-				$msg = $e->get_params();
-				array_unshift($msg, $e->get_error());
+				array_unshift($params, $e->getMessage());
 			}
 			else
 			{
-				$msg = $e->get_error();
+				$params = $e->getMessage();
 			}
 
-			$this->iohandler->add_error_message($msg);
+			$this->iohandler->add_error_message($params);
 			$flush_messages = true;
 		}
 
-- 
cgit v1.2.1