Permalink
Browse files

Adding separate `error` layout for CakeErrorController as using `defa…

…ult` layout often caused nested errors. Closes #2682
  • Loading branch information...
1 parent 47a2c22 commit 0832e18e9e971acdb3e7e7aab3bfe85314b3bb7b @ADmad ADmad committed Mar 11, 2012
View
@@ -0,0 +1,61 @@
+<?php
+/**
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org CakePHP(tm) Project
+ * @package Cake.View.Layouts
+ * @since CakePHP(tm) v 0.10.0.1076
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <?php echo $this->Html->charset(); ?>
+ <title>
+ <?php echo $cakeDescription ?>:
+ <?php echo $title_for_layout; ?>
+ </title>
+ <?php
+ echo $this->Html->meta('icon');
+
+ echo $this->Html->css('cake.generic');
+
+ echo $this->fetch('meta');
+ echo $this->fetch('css');
+ echo $this->fetch('script');
+ ?>
+</head>
+<body>
+ <div id="container">
+ <div id="header">
+ <h1><?php echo $this->Html->link($cakeDescription, 'http://cakephp.org'); ?></h1>
+ </div>
+ <div id="content">
+
+ <?php echo $this->Session->flash(); ?>
+
+ <?php echo $this->fetch('content'); ?>
+ </div>
+ <div id="footer">
+ <?php echo $this->Html->link(
+ $this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
+ 'http://www.cakephp.org/',
+ array('target' => '_blank', 'escape' => false)
+ );
+ ?>
+ </div>
+ </div>
+ <?php echo $this->element('sql_dump'); ?>
+</body>
+</html>
@@ -0,0 +1,59 @@
+<?php
+/**
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link http://cakephp.org CakePHP(tm) Project
+ * @package app.View.Layouts
+ * @since CakePHP(tm) v 0.10.0.1076
+ * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <?php echo $this->Html->charset(); ?>
+ <title>
+ <?php echo __('CakePHP: the rapid development php framework:'); ?>
+ <?php echo $title_for_layout; ?>
+ </title>
+ <?php
+ echo $this->Html->meta('icon');
+
+ echo $this->Html->css('cake.generic');
+
+ echo $this->fetch('meta');
+ echo $this->fetch('css');
+ echo $this->fetch('script');
+ ?>
+</head>
+<body>
+ <div id="container">
+ <div id="header">
+ <h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework'), 'http://cakephp.org'); ?></h1>
+ </div>
+ <div id="content">
+
+ <?php echo $this->Session->flash(); ?>
+
+ <?php echo $this->fetch('content'); ?>
+ </div>
+ <div id="footer">
+ <?php echo $this->Html->link(
+ $this->Html->image('cake.power.gif', array('alt' => __('CakePHP: the rapid development php framework'), 'border' => '0')),
+ 'http://www.cakephp.org/',
+ array('target' => '_blank', 'escape' => false)
+ );
+ ?>
+ </div>
+ </div>
+ <?php echo $this->element('sql_dump'); ?>
+</body>
+</html>
@@ -280,6 +280,7 @@ protected function _outputMessageSafe($template) {
$this->controller->subDir = '';
$this->controller->viewPath = 'Errors/';
$this->controller->viewClass = 'View';
+ $this->controller->layout = 'error';
$this->controller->helpers = array('Form', 'Html', 'Session');
$this->controller->render($template);

0 comments on commit 0832e18

Please sign in to comment.