github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-01 10:35:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up code, use PHP 7 feature :)

Browse Source
This commit is contained in:
Franz Liedke 2018-01-02 19:25:20 +01:00
parent fe56f57e8f
commit 3f7e7520b0
No known key found for this signature in database
GPG Key ID: 9A0231A879B055F4
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Http/Middleware/HandleErrors.php
View File

@ -101,7 +101,7 @@ class HandleErrors
// Log the exception (with trace)
$this->logger->debug($error);
if (! $this->view->exists($name = 'flarum.forum::error.'.$status)) {
if (! $this->view->exists($name = "flarum.forum::error.$status")) {
$name = 'flarum.forum::error.default';
}
@ -114,20 +114,16 @@ class HandleErrors
private function getMessage($status)
{
if (! $translation = $this->getTranslationIfExists($status)) {
if (! $translation = $this->getTranslationIfExists(500)) {
$translation = 'An error occurred while trying to load this page.';
}
}
return $translation;
return $this->getTranslationIfExists($status)
?? $this->getTranslationIfExists(500)
?? 'An error occurred while trying to load this page.';
}
private function getTranslationIfExists($status)
{
$key = 'core.views.error.'.$status.'_message';
$key = "core.views.error.${status}_message";
$translation = $this->translator->trans($key, ['{forum}' => $this->settings->get('forum_title')]);
return $translation === $key ? false : $translation;
return $translation === $key ? null : $translation;
}
}