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

Merge pull request #6438 from owncloud/core-logexceptionfix 

Do not use L10n when logging exceptions
This commit is contained in:
Thomas Müller 2013-12-17 00:53:03 -08:00
parent 753525c57f 2a1d6d3106
commit 275d666d26
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() . '] ';