mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 21:13:50 +01:00
Code Issues Releases Wiki Activity

[ticket/14306] Update the error message

Browse Source 
PHPBB3-14306
This commit is contained in:
Tristan Darricau 2015-12-15 20:18:55 +01:00
parent 761fa9da52
commit 7f8b6c02c6
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/adm/style/overall_header.html
View File

@ -149,8 +149,7 @@ function popup(url, width, height, name)
<!-- IF CONTAINER_EXCEPTION !== false -->
<div class="errorbox">
<p>{L_CONTAINER_EXCEPTION}</p>
<p>{L_CONTAINER_EXCEPTION_DETAIL}</p>
<p>Exception message: {{ CONTAINER_EXCEPTION.getMessage() }}</p>
<p>{L_EXCEPTION}{L_COLON} {{ CONTAINER_EXCEPTION.getMessage() }}</p>
<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
</div>
<!-- ENDIF -->

3
phpBB/language/en/acp/common.php
View File

@ -225,6 +225,9 @@ $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.',
'EXCEPTION' => 'Exception',
'COLOUR_SWATCH' => 'Web-safe colour swatch',
'CONFIG_UPDATED' => 'Configuration updated successfully.',
'CRON_LOCK_ERROR' => 'Could not obtain cron lock.',

3
phpBB/phpbb/di/container_builder.php
View File

@ -192,7 +192,8 @@ class container_builder
catch (\Exception $e)
{
// Don't try to recover if we are in the development environment
if ($this->get_environment() === 'development') {
if ($this->get_environment() === 'development')
{
throw $e;
}