mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not use L10n when logging exceptions 

In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.

This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
This commit is contained in:
Vincent Petry 2013-12-16 15:04:02 +01:00
parent 77b68505c2
commit 2a1d6d3106
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/template.php
View File

@ -292,9 +292,8 @@ class OC_Template extends \OC\Template\Base {
if (!empty($hint)) {
$hint = '<pre>'.$hint.'</pre>';
}
$l = OC_L10N::get('lib');
while (method_exists($exception, 'previous') && $exception = $exception->previous()) {
$error_msg .= '<br/>'.$l->t('Caused by:').' ';
$error_msg .= '<br/>Caused by:' . ' ';
if ($exception->getCode()) {
$error_msg .= '['.$exception->getCode().'] ';
}

3
lib/public/util.php
View File

@ -103,9 +103,8 @@ class Util {
}
// include cause
$l = \OC_L10N::get('lib');
while (method_exists($ex, 'getPrevious') && $ex = $ex->getPrevious()) {
$message .= ' - '.$l->t('Caused by:').' ';
$message .= ' - Caused by:' . ' ';
$message .= $ex->getMessage();
if ($ex->getCode()) {
$message .= '[' . $ex->getCode() . '] ';