mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
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:
parent
89fbf1c8bf
commit
265386fc2a
4 changed files with 4 additions and 4 deletions
|
@ -6,4 +6,4 @@
|
|||
// +---------------------------------------------------------------------------------------------------+ //
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
1.0.0.2250
|
||||
1.0.0.2254
|
|
@ -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
|
||||
|
|
|
@ -107,7 +107,7 @@ else
|
|||
}
|
||||
|
||||
$TIME_START = getMicrotime();
|
||||
if(defined('CACHE_CHECK'))
|
||||
if(defined('CACHE_CHECK') && CACHE_CHECK === true)
|
||||
{
|
||||
if (empty($uri))
|
||||
{
|
||||
|
|
|
@ -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))
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue