adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging changes for SessionHelper into 1.2.x.x branch

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3458 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-09-10 14:33:20 +00:00
parent 5dcd93f0ff
commit e08a4a1da6
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cake/libs/view/templates/layouts/default.thtml
View file

@ -28,7 +28,8 @@
<!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>CakePHP : <?php echo $title_for_layout;?></title> <title>CakePHP : <?php echo $title_for_layout;?></title>
<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');?>
</head> </head>
@ -38,9 +39,9 @@
<h1>CakePHP Rapid Development</h1> <h1>CakePHP Rapid Development</h1>
</div> </div>
<div id="content"> <div id="content">
<?php if ($this->controller->Session->check('Message.flash')) <?php if ($session->check('Message.flash'))
{ {
$this->controller->Session->flash(); $session->flash();
} }
echo $content_for_layout; echo $content_for_layout;
?> ?>

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

@ -740,7 +740,7 @@ class View extends Object{
*/ */
function &_loadHelpers(&$loaded, $helpers) { function &_loadHelpers(&$loaded, $helpers) {
static $tags; static $tags;
$helpers[] = 'Session';
if (empty($tags)) { if (empty($tags)) {
$helperTags = new Helper(); $helperTags = new Helper();
$tags = $helperTags->loadConfig(); $tags = $helperTags->loadConfig();