Display a simple error if the translation option does not work #146

adaur · adaur · commit 0c814b43d010 · 2019-05-04T20:05:07.000-04:00
diff --git a/featherbb/routes.php b/featherbb/routes.php
@@ -222,7 +222,8 @@
         }
 
         // Display a simple error page that does not require heavy user-specific methods like permissions
-        if (method_exists($e, 'isSimpleError') && $e->isSimpleError()) {
+        if (method_exists($e, 'isSimpleError') && $e->isSimpleError()
+            || !function_exists('__')) {
             if (ob_get_contents()) {
                 ob_end_clean();
             }
@@ -245,7 +246,6 @@
             $error['html'] = $e->displayHtml();
         }
 
-
         return View::setPageInfo([
             'title' => [\FeatherBB\Core\Utils::escape(ForumSettings::get('o_board_title')), __('Error')],
             'msg'    =>    $error['message'],

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,8 @@`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`// Display a simple error page that does not require heavy user-specific methods like permissions`
`225`		`- if (method_exists($e, 'isSimpleError') && $e->isSimpleError()) {`
	`225`	`+ if (method_exists($e, 'isSimpleError') && $e->isSimpleError()`
	`226`	`+ \|\| !function_exists('__')) {`
`226`	`227`	`if (ob_get_contents()) {`
`227`	`228`	`ob_end_clean();`
`228`	`229`	`}`
`@@ -245,7 +246,6 @@`
`245`	`246`	`$error['html'] = $e->displayHtml();`
`246`	`247`	`}`
`247`	`248`
`248`		`-`
`249`	`249`	`return View::setPageInfo([`
`250`	`250`	`'title' => [\FeatherBB\Core\Utils::escape(ForumSettings::get('o_board_title')), __('Error')],`
`251`	`251`	`'msg' => $error['message'],`