Adding fix for Ticket #1648

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3948 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-11-24 03:53:44 +00:00
parent e8751b7103
commit e42df60a24

View file

@ -731,6 +731,8 @@ class View extends Object {
$cache->cacheAction = $this->controller->cacheAction;
$cache->cache($___viewFn, $out, $cached);
}
$replace = array('<cake:nocache>', '</cake:nocache>');
$out = str_replace($replace, '', $out);
}
return $out;
@ -841,9 +843,9 @@ class View extends Object {
} else {
if($this->layout === 'xml'){
header('Content-type: text/xml');
$out = preg_replace('/^<!--cachetime:(\\d+)-->/', '', $out);
}
$out = str_replace('<!--cachetime:'.$match['1'].'-->','',$out);
$replace = array('<!--cachetime:'.$match['1'].'-->', '<cake:nocache>', '</cake:nocache>');
$out = str_replace($replace, '', $out);
e($out);
die();
}