mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-20 00:01:17 +02:00
Code Issues 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 2a8545c389
commit 66a320398e
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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