adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 11:02:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.3

Browse source 
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
This commit is contained in:
mark_story 2012-11-20 23:02:33 -05:00
commit 27d7e2865e
42 changed files with 156 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/Cake/basics.php
View file

@ -422,19 +422,27 @@ if (!function_exists('cache')) {
$filetime = false;
if (file_exists($filename)) {
//@codingStandardsIgnoreStart
$filetime = @filemtime($filename);
//@codingStandardsIgnoreEnd
}
if ($data === null) {
if (file_exists($filename) && $filetime !== false) {
if ($filetime + $timediff < $now) {
//@codingStandardsIgnoreStart
@unlink($filename);
//@codingStandardsIgnoreEnd
} else {
//@codingStandardsIgnoreStart
$data = @file_get_contents($filename);
//@codingStandardsIgnoreEnd
}
}
} elseif (is_writable(dirname($filename))) {
//@codingStandardsIgnoreStart
@file_put_contents($filename, $data, LOCK_EX);
//@codingStandardsIgnoreEnd
}
return $data;
}
@ -459,7 +467,9 @@ if (!function_exists('clearCache')) {
$cache = CACHE . $type . DS . $params;
if (is_file($cache . $ext)) {
//@codingStandardsIgnoreStart
@unlink($cache . $ext);
//@codingStandardsIgnoreEnd
return true;
} elseif (is_dir($cache)) {
$files = glob($cache . '*');
@ -470,7 +480,9 @@ if (!function_exists('clearCache')) {
foreach ($files as $file) {
if (is_file($file) && strrpos($file, DS . 'empty') !== strlen($file) - 6) {
//@codingStandardsIgnoreStart
@unlink($file);
//@codingStandardsIgnoreEnd
}
}
return true;
@ -491,7 +503,9 @@ if (!function_exists('clearCache')) {
}
foreach ($files as $file) {
if (is_file($file) && strrpos($file, DS . 'empty') !== strlen($file) - 6) {
//@codingStandardsIgnoreStart
@unlink($file);
//@codingStandardsIgnoreEnd
}
}
return true;