summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
Diffstat (limited to 'system/core')
-rwxr-xr-xsystem/core/Output.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index 272545046..1beee734f 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -488,8 +488,7 @@ class CI_Output {
$uri = $CFG->item('base_url').$CFG->item('index_page').$URI->uri_string;
$filepath = $cache_path.md5($uri);
- if ( ! @file_exists($filepath)
- OR ! $fp = @fopen($filepath, FOPEN_READ))
+ if ( ! @file_exists($filepath) OR ! $fp = @fopen($filepath, FOPEN_READ))
{
return FALSE;
}
@@ -508,8 +507,7 @@ class CI_Output {
}
// Has the file expired? If so we'll delete it.
- if (time() >= trim(str_replace('TS--->', '', $match[1]))
- AND is_really_writable($cache_path))
+ if (time() >= trim(str_replace('TS--->', '', $match[1])) && is_really_writable($cache_path))
{
@unlink($filepath);
log_message('debug', 'Cache file has expired. File deleted.');