From c49da62c233f0f20334b11cd60086811e67abda3 Mon Sep 17 00:00:00 2001 From: mark_story Date: Wed, 18 Apr 2012 22:23:18 -0400 Subject: [PATCH] Update content_for_layout to use fetch() Fixes #2803 --- app/View/Layouts/ajax.ctp | 2 +- app/View/Layouts/js/default.ctp | 2 +- app/View/Layouts/rss/default.ctp | 4 ++-- app/View/Layouts/xml/default.ctp | 2 +- .../Templates/skel/View/Layouts/Emails/html/default.ctp | 4 ++-- .../Templates/skel/View/Layouts/Emails/text/default.ctp | 2 +- lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp | 2 +- lib/Cake/Console/Templates/skel/View/Layouts/js/default.ctp | 2 +- lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp | 4 ++-- lib/Cake/Console/Templates/skel/View/Layouts/xml/default.ctp | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/View/Layouts/ajax.ctp b/app/View/Layouts/ajax.ctp index c0ca27058..c0da8502a 100644 --- a/app/View/Layouts/ajax.ctp +++ b/app/View/Layouts/ajax.ctp @@ -16,4 +16,4 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> - \ No newline at end of file +fetch('content'); ?> diff --git a/app/View/Layouts/js/default.ctp b/app/View/Layouts/js/default.ctp index d94dc903a..7239b5dae 100644 --- a/app/View/Layouts/js/default.ctp +++ b/app/View/Layouts/js/default.ctp @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/View/Layouts/rss/default.ctp b/app/View/Layouts/rss/default.ctp index 2b8e9d434..077de6125 100644 --- a/app/View/Layouts/rss/default.ctp +++ b/app/View/Layouts/rss/default.ctp @@ -8,7 +8,7 @@ if (!isset($channel['title'])) { echo $this->Rss->document( $this->Rss->channel( - array(), $channel, $content_for_layout + array(), $channel, $this->fetch('content') ) ); -?> \ No newline at end of file +?> diff --git a/app/View/Layouts/xml/default.ctp b/app/View/Layouts/xml/default.ctp index 27f20316b..fbd5ee0c3 100644 --- a/app/View/Layouts/xml/default.ctp +++ b/app/View/Layouts/xml/default.ctp @@ -1 +1 @@ - +fetch('content'); ?> diff --git a/lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp b/lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp index 0df9def85..a1cc8369c 100644 --- a/lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp +++ b/lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp @@ -24,8 +24,8 @@ - + fetch('content');?>

This email was sent using the CakePHP Framework

- \ No newline at end of file + diff --git a/lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp b/lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp index ba3086ad9..0a25fb93d 100644 --- a/lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp +++ b/lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp @@ -17,6 +17,6 @@ */ ?> - +fetch('content');?> This email was sent using the CakePHP Framework, http://cakephp.org. diff --git a/lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp b/lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp index 9475d5f7d..9dc5ee58e 100644 --- a/lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp +++ b/lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp @@ -16,4 +16,4 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> - \ No newline at end of file +fetch('content'); ?> diff --git a/lib/Cake/Console/Templates/skel/View/Layouts/js/default.ctp b/lib/Cake/Console/Templates/skel/View/Layouts/js/default.ctp index d94dc903a..7239b5dae 100644 --- a/lib/Cake/Console/Templates/skel/View/Layouts/js/default.ctp +++ b/lib/Cake/Console/Templates/skel/View/Layouts/js/default.ctp @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp b/lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp index 2b8e9d434..077de6125 100644 --- a/lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp +++ b/lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp @@ -8,7 +8,7 @@ if (!isset($channel['title'])) { echo $this->Rss->document( $this->Rss->channel( - array(), $channel, $content_for_layout + array(), $channel, $this->fetch('content') ) ); -?> \ No newline at end of file +?> diff --git a/lib/Cake/Console/Templates/skel/View/Layouts/xml/default.ctp b/lib/Cake/Console/Templates/skel/View/Layouts/xml/default.ctp index 27f20316b..fbd5ee0c3 100644 --- a/lib/Cake/Console/Templates/skel/View/Layouts/xml/default.ctp +++ b/lib/Cake/Console/Templates/skel/View/Layouts/xml/default.ctp @@ -1 +1 @@ - +fetch('content'); ?>