adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

"Fixes #3649, Page_Title Bug in Flash()/Render()"

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6114 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-12-03 01:47:17 +00:00
parent 1a223ee7a2
commit d815b823dd
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cake/libs/view/templates/layouts/default.ctp
View file

@ -29,20 +29,20 @@
<head> <head>
<title> <title>
<?php __('CakePHP: the rapid development php framework:'); ?> <?php __('CakePHP: the rapid development php framework:'); ?>
<?php echo $title_for_layout;?> <?php echo $title_for_layout; ?>
</title> </title>
<?php echo $html->charset();?> <?php echo $html->charset(); ?>
<link rel="icon" href="<?php echo $this->webroot;?>favicon.ico" type="image/x-icon" /> <link rel="icon" href="<?php echo $this->webroot; ?>favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->webroot;?>favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="<?php echo $this->webroot; ?>favicon.ico" type="image/x-icon" />
<?php echo $html->css('cake.generic');?> <?php echo $html->css('cake.generic'); ?>
<?php echo $scripts_for_layout;?> <?php echo $scripts_for_layout; ?>
</head> </head>
<body> <body>
<div id="container"> <div id="container">
<div id="header"> <div id="header">
<h1><?php echo $html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org');?></h1> <h1><?php echo $html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org'); ?></h1>
</div> </div>
<div id="content"> <div id="content">
<?php <?php
@ -51,7 +51,7 @@
endif; endif;
?> ?>
<?php echo $content_for_layout;?> <?php echo $content_for_layout; ?>
</div> </div>
<div id="footer"> <div id="footer">
@ -63,6 +63,6 @@
?> ?>
</div> </div>
</div> </div>
<?php echo $cakeDebug?> <?php echo $cakeDebug; ?>
</body> </body>
</html> </html>

6
cake/libs/view/templates/layouts/flash.ctp
View file

@ -27,11 +27,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title><?php echo $page_title?></title> <title><?php echo $page_title; ?></title>
<?php echo $html->charset(); ?> <?php echo $html->charset(); ?>
<?php if (Configure::read() == 0) { ?> <?php if (Configure::read() == 0) { ?>
<meta http-equiv="Refresh" content="<?php echo $pause?>;url=<?php echo $url?>"/> <meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
<?php } ?> <?php } ?>
<style><!-- <style><!--
P { text-align:center; font:bold 1.1em sans-serif } P { text-align:center; font:bold 1.1em sans-serif }
@ -40,6 +40,6 @@ A:HOVER { text-decoration: underline; color:#44E }
--></style> --></style>
</head> </head>
<body> <body>
<p><a href="<?php echo $url?>"><?php echo $message?></a></p> <p><a href="<?php echo $url; ?>"><?php echo $message; ?></a></p>
</body> </body>
</html> </html>

1
cake/libs/view/view.php
View file

@ -774,7 +774,6 @@ class View extends Object {
extract($___dataForView, EXTR_SKIP); extract($___dataForView, EXTR_SKIP);
$BASE = $this->base; $BASE = $this->base;
$params =& $this->params; $params =& $this->params;
$page_title = $this->pageTitle;
ob_start(); ob_start();