Merge branch 'beta' into hotfixes

1 files changed, 36 insertions, 23 deletions

diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index 922650b3d..6c080bea8 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -1,35 +1,48 @@
 <?php
 
+/**
+ * Controller to handle error page.
+ */
 class FreshRSS_error_Controller extends Minz_ActionController {
+	/**
+	 * This action is the default one for the controller.
+	 *
+	 * It is called by Minz_Error::error() method.
+	 *
+	 * Parameters are:
+	 *   - code (default: 404)
+	 *   - logs (default: array())
+	 */
 	public function indexAction() {
-		switch (Minz_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';
+		$code_int = Minz_Request::param('code', 404);
+		switch ($code_int) {
+		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';
 		}
 
 		$errors = Minz_Request::param('logs', array());
 		$this->view->errorMessage = trim(implode($errors));
 		if ($this->view->errorMessage == '') {
-			switch(Minz_Request::param('code')) {
-				case 403:
-					$this->view->errorMessage = Minz_Translate::t('forbidden_access');
-					break;
-				case 404:
-				default:
-					$this->view->errorMessage = Minz_Translate::t('page_not_found');
-					break;
+			switch($code_int) {
+			case 403:
+				$this->view->errorMessage = _t('access_denied');
+				break;
+			case 404:
+			default:
+				$this->view->errorMessage = _t('page_not_found');
+				break;
 			}
 		}