diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-01-30 19:00:15 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-30 19:00:15 +0100 |
| commit | 3fef570950e27c9a60bcc57ef176d1d257a194bd (patch) | |
| tree | 94d2cfea914525a531ca91aa181dccb9295e1e7b /phpBB/phpbb/version_helper.php | |
| parent | e5f2eee167775dd8f7f1920a9d25fcf70919f8dd (diff) | |
| parent | 69450c715244e41a26e63470bd292778ed25438a (diff) | |
| download | forums-3fef570950e27c9a60bcc57ef176d1d257a194bd.tar forums-3fef570950e27c9a60bcc57ef176d1d257a194bd.tar.gz forums-3fef570950e27c9a60bcc57ef176d1d257a194bd.tar.bz2 forums-3fef570950e27c9a60bcc57ef176d1d257a194bd.tar.xz forums-3fef570950e27c9a60bcc57ef176d1d257a194bd.zip | |
Merge pull request #3354 from nickvergessen/ticket/13556
[ticket/13556] Fix exception translation with filedownloader
* nickvergessen/ticket/13556:
[ticket/13556] Fix exception translation with filedownloader
Diffstat (limited to 'phpBB/phpbb/version_helper.php')
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index dc62f06fb2..e4f68f5aab 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -257,9 +257,10 @@ class version_helper try { $info = $this->file_downloader->get($this->host, $this->path, $this->file); } - catch (\RuntimeException $exception) + catch (\phpbb\exception\runtime_exception $exception) { - throw new \RuntimeException($this->user->lang($exception->getMessage())); + $prepare_parameters = array_merge(array($exception->getMessage()), $exception->get_parameters()); + throw new \RuntimeException(call_user_func_array(array($this->user, 'lang'), $prepare_parameters)); } $error_string = $this->file_downloader->get_error_string(); |