Merge branch 'master' into hotfixes

1 files changed, 0 insertions, 26 deletions

diff --git a/app/controllers/errorController.php b/app/controllers/errorController.php
deleted file mode 100644
index 092609280..000000000
--- a/app/controllers/errorController.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-class ErrorController extends ActionController {
-	public function indexAction () {
-		switch (Request::param ('code')) {
-		case 403:
-			$this->view->code = 'Error 403 - Forbidden';
-			break;
-		case 404:
-			$this->view->code = 'Error 404 - Not found';
-			break;
-		case 500:
-			$this->view->code = 'Error 500 - Internal Server Error';
-			break;
-		case 503:
-			$this->view->code = 'Error 503 - Service Unavailable';
-			break;
-		default:
-			$this->view->code = 'Error 404 - Not found';
-		}
-		
-		$this->view->logs = Request::param ('logs');
-		
-		View::prependTitle ($this->view->code . ' - ');
-	}
-}