From d815b823dd207983be6e069b689bb39fa682b337 Mon Sep 17 00:00:00 2001 From: phpnut Date: Mon, 3 Dec 2007 01:47:17 +0000 Subject: [PATCH] "Fixes #3649, Page_Title Bug in Flash()/Render()" git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6114 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/view/templates/layouts/default.ctp | 18 +++++++++--------- cake/libs/view/templates/layouts/flash.ctp | 6 +++--- cake/libs/view/view.php | 1 - 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cake/libs/view/templates/layouts/default.ctp b/cake/libs/view/templates/layouts/default.ctp index b61ad297d..20f398702 100644 --- a/cake/libs/view/templates/layouts/default.ctp +++ b/cake/libs/view/templates/layouts/default.ctp @@ -29,20 +29,20 @@ <?php __('CakePHP: the rapid development php framework:'); ?> - <?php echo $title_for_layout;?> + <?php echo $title_for_layout; ?> - charset();?> + charset(); ?> - - - css('cake.generic');?> - + + + css('cake.generic'); ?> +
- +
- + diff --git a/cake/libs/view/templates/layouts/flash.ctp b/cake/libs/view/templates/layouts/flash.ctp index b39b71171..e34ee46bf 100644 --- a/cake/libs/view/templates/layouts/flash.ctp +++ b/cake/libs/view/templates/layouts/flash.ctp @@ -27,11 +27,11 @@ -<?php echo $page_title?> +<?php echo $page_title; ?> charset(); ?> - + -

+

\ No newline at end of file diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php index 702730905..31beedc2d 100644 --- a/cake/libs/view/view.php +++ b/cake/libs/view/view.php @@ -774,7 +774,6 @@ class View extends Object { extract($___dataForView, EXTR_SKIP); $BASE = $this->base; $params =& $this->params; - $page_title = $this->pageTitle; ob_start();