Merging fixes and enhancements into trunk.

Revision: [2253]
"Changing define to false by default"

Revision: [2251][2252]
"Adding check if define is not set"

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2254 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-03-12 00:32:20 +00:00
parent 89fbf1c8bf
commit 265386fc2a
4 changed files with 4 additions and 4 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.0.0.2250
1.0.0.2254

View file

@ -59,7 +59,7 @@ define('DEBUG', 1);
* You can either set it controller wide, or in each controller method.
* use var $cacheAction = true; or in the controller method $this->cacheAction = true;
*/
define ('CACHE_CHECK', true);
define ('CACHE_CHECK', false);
/**
* Error constant. Used for differentiating error logging and debugging.
* Currently PHP supports LOG_DEBUG

View file

@ -107,7 +107,7 @@ else
}
$TIME_START = getMicrotime();
if(defined('CACHE_CHECK'))
if(defined('CACHE_CHECK') && CACHE_CHECK === true)
{
if (empty($uri))
{

View file

@ -655,7 +655,7 @@ class View extends Object
}
$out = ob_get_clean();
if($this->controller->cacheAction != false && CACHE_CHECK === true)
if($this->controller->cacheAction != false && (defined('CACHE_CHECK') && CACHE_CHECK === true))
{
if(is_array($this->controller->cacheAction))
{