diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-15 20:18:55 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-09 15:35:17 +0100 |
| commit | 7f8b6c02c6380d44d2bc3c402cfa5e9953d4819b (patch) | |
| tree | d09eb602b044e6b2ccd98bd73148612d6d23741e | |
| parent | 761fa9da52e92efafa6839938113ddb55cd85f17 (diff) | |
| download | forums-7f8b6c02c6380d44d2bc3c402cfa5e9953d4819b.tar forums-7f8b6c02c6380d44d2bc3c402cfa5e9953d4819b.tar.gz forums-7f8b6c02c6380d44d2bc3c402cfa5e9953d4819b.tar.bz2 forums-7f8b6c02c6380d44d2bc3c402cfa5e9953d4819b.tar.xz forums-7f8b6c02c6380d44d2bc3c402cfa5e9953d4819b.zip | |
[ticket/14306] Update the error message
PHPBB3-14306
| -rw-r--r-- | phpBB/adm/style/overall_header.html | 3 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index dbf27eb942..4212f01f15 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -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 --> diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index a1e2d1ef40..24db3f31fe 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -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.', diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 6e6fb5c7fb..d90f78c0d9 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -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; } |