Releasing 1.0.0

Author: technicalguru

src/WebApp/Application.php

@@ -329,6 +329,10 @@ public function getMenu($id = NULL) {
 		return NULL;
 	}
 
+	public function getErrorPage($httpCode, $text, $throwable = NULL) {
+		return NULL;
+	}
+
 	/**
 	 * Persist any error message in the database.
 	 */

src/WebApp/Service.php

@@ -35,7 +35,8 @@ public function run() {
 			}
 		} catch (\Throwable $e) {
 			\TgLog\Log::error('Cannot create application', $e);
-			$page = new Error\ErrorPage($this->app, 500, 'Internal Error', $e);
+			$page = $this->theme->getErrorPage(500, 'Internal Error', $e);
+			// $page = new Error\ErrorPage($this->app, 500, 'Internal Error', $e);
 			$page->processRequest();
 			$this->theme->render($page);
 		}
@@ -63,7 +64,7 @@ protected function createPage() {
 
 			// Get a specific error page from the theme
 			if ($page == NULL) {
-				$page = $this->theme->getErrorPage(404);
+				$page = $this->theme->getErrorPage(404, 'Error');
 			}
 
 			// Get the default error page
@@ -73,7 +74,8 @@ protected function createPage() {
 			return $page;
 		} catch (\Throwable $e) {
 			\TgLog\Log::error('Cannot create application', $e);
-			return new Error\ErrorPage($this->app, 500, 'Internal Error', $e);
+			return $this->theme->getErrorPage(500, 'Internal Error', $e);
+			//return new Error\ErrorPage($this->app, 500, 'Internal Error', $e);
 		}
 	}
 

src/WebApp/Theme.php

@@ -183,9 +183,10 @@ public function hasFeature($name) {
 		return in_array($name, $this->features);
 	}
 
-	public function getErrorPage($htmlCode) {
-		$name = '\\WebApp\\Error\\ErrorPage';
-		return new $name($this->app, $htmlCode, 'Error');
+	public function getErrorPage($htmlCode, $text, $throwable = NULL) {
+		$rc = $this->app->getErrorPage($htmlCode, $text, $throwable);
+		if ($rc == NULL) $rc = new \WebApp\Error\ErrorPage($this->app, $htmlCode, $text, $throwable);
+		return $rc;
 	}
 }
 

src/i18n.php

@@ -131,7 +131,7 @@
 	),
 	'error_page_title' => array(
 		'de' => 'Gratulation!',
-		'en' => 'Congratulation!',
+		'en' => 'Congrats!',
 	),
 	'error_page_subtitle' => array(
 		'de' => 'Jetzt habt Ihr die Seite kaputt gemacht.',