From 1e0340b0cf7cc34094e03985457f1aed2f60da36 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sat, 9 Jan 2016 18:03:21 +0100
Subject: [PATCH] =?UTF-8?q?[ticket/14306]=C2=A0Improves=20Error=20display?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PHPBB3-14306
---
 phpBB/adm/style/overall_header.html | 2 +-
 phpBB/language/en/acp/common.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 3feb94f89c..9266372ab8 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -148,7 +148,7 @@ function popup(url, width, height, name)
 						<div class="main">
 							{% if CONTAINER_EXCEPTION !== false %}
 							<div class="errorbox">
-								<p>{{ lang('CONTAINER_EXCEPTION') }}</p>
+								<p>{{ lang('CONTAINER_EXCEPTION') }}</p><br />
 								<p>{{ lang('EXCEPTION') }}{{ lang('COLON') }} {{ CONTAINER_EXCEPTION.getMessage() }}</p>
 								<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
 							</div>
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 24db3f31fe..4a70aafc6f 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -225,7 +225,7 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
-	'CONTAINER_EXCEPTION' => 'phpBB encountered an error building the container due to an installed extension. For this reason, all extensions have been temporarily disabled. Please try purging your forum cache. All extensions will automatically be re-enabled once the container error is resolved. If this error continues, please visit phpBB.com for support.',
+	'CONTAINER_EXCEPTION' => 'phpBB encountered an error building the container due to an installed extension. For this reason, all extensions have been temporarily disabled. Please try purging your forum cache. All extensions will automatically be re-enabled once the container error is resolved. If this error continues, please visit <a href="https://www.phpbb.com/support">phpBB.com</a> for support.',
 	'EXCEPTION' => 'Exception',
 
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',