diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-12-17 00:53:03 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-12-17 00:53:03 -0800 |
| commit | 275d666d2630b94229d88c10b7978e66fd0b8079 (patch) | |
| tree | 879c80a155df1146b04e43dd9650d04ad8a7c83f | |
| parent | 753525c57f2fb0fce6d03e29aae36e138221983a (diff) | |
| parent | 2a1d6d310628fbd22b1972442b19ad98d8ff7ad1 (diff) | |
| download | nextcloud-server-275d666d2630b94229d88c10b7978e66fd0b8079.tar.gz nextcloud-server-275d666d2630b94229d88c10b7978e66fd0b8079.zip | |
Merge pull request #6438 from owncloud/core-logexceptionfix
Do not use L10n when logging exceptions
| -rw-r--r-- | lib/private/template.php | 3 | ||||
| -rw-r--r-- | lib/public/util.php | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/private/template.php b/lib/private/template.php index 9b2c1211e61..b2c3a20f281 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -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().'] '; } diff --git a/lib/public/util.php b/lib/public/util.php index 1d76fd1e1f7..8e85f9afc3f 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -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() . '] '; |