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 | 7531bfb2912c6915e8e9b094f08ae944342cd90f (patch) | |
| tree | 8eb9592c395d941e99d495647887de7f7ab6aaa1 /phpBB/phpbb/version_helper.php | |
| parent | 1b185413bf62a94d8c5119cf4a86c0a0b366d00a (diff) | |
| parent | 2690038d404779a71ee81f36416886f63414d582 (diff) | |
| download | forums-7531bfb2912c6915e8e9b094f08ae944342cd90f.tar forums-7531bfb2912c6915e8e9b094f08ae944342cd90f.tar.gz forums-7531bfb2912c6915e8e9b094f08ae944342cd90f.tar.bz2 forums-7531bfb2912c6915e8e9b094f08ae944342cd90f.tar.xz forums-7531bfb2912c6915e8e9b094f08ae944342cd90f.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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(); |