From a765f23f83f25e4fc6756ce64fd2486337394e01 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 19 Apr 2014 12:23:49 +0530
Subject: [PATCH] Tweak template name generation.

---
 src/Error/ExceptionRenderer.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Error/ExceptionRenderer.php b/src/Error/ExceptionRenderer.php
index 3596217ff7e..4bc5b9884a3 100644
--- a/src/Error/ExceptionRenderer.php
+++ b/src/Error/ExceptionRenderer.php
@@ -177,9 +177,9 @@ protected function _message(\Exception $exception, $code) {
  * @return string Template name
  */
 	protected function _template(\Exception $exception, $code) {
-		if (!Configure::read('debug') &&
-			!($exception instanceof Error\HttpException)
-		) {
+		$isHttpException = $exception instanceof Error\HttpException;
+
+		if (!Configure::read('debug') && !$isHttpException) {
 			$template = 'error500';
 			if ($code < 500) {
 				$template = 'error400';
@@ -187,21 +187,20 @@ protected function _template(\Exception $exception, $code) {
 			return $this->template = $template;
 		}
 
-		list(, $baseClass) = namespaceSplit(get_class($exception));
-		$baseClass = substr($baseClass, 0, -9);
-		$template = Inflector::variable($baseClass);
-
-		if (empty($template) || $template === 'internalError') {
+		if ($isHttpException) {
 			$template = 'error500';
+			if ($code < 500) {
+				$template = 'error400';
+			}
+			return $this->template = $template;
 		}
 
+		list(, $baseClass) = namespaceSplit(get_class($exception));
+		$baseClass = substr($baseClass, 0, -9);
+		$template = Inflector::variable($baseClass) ?: 'error500';
+
 		if ($exception instanceof \PDOException) {
 			$template = 'pdo_error';
-		} elseif ($exception instanceof Error\HttpException) {
-			$template = 'error500';
-			if ($code < 500) {
-				$template = 'error400';
-			}
 		}
 
 		return $this->template = $template;