diff --git a/CHANGELOG b/CHANGELOG index f3462cee7..3eeecf73a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,13 +7,14 @@ Version 1.1.18 under development - Enh #4049: Added '//' as a proper beginning of absolute URL in createAbsoluteUrl() method (ksowa) - Bug #4015: Fixed bug with missing "disabled" attribute in internally rendered hidden fields (rob006) - Bug #4020: Fixed PHP 7 related bug in CCacheHttpSession when destroying not cached sessions (dirx) -- Chg #4033: Updated Pear/Text used by Gii so it's PHP 7 compatible (samdark) - Bug #4034: Fixed `CHttpSession::getIsStarted()` PHP 7 compatibility (tomotomo) - Bug #4061: Fixed "Fatal Error: Nesting level too deep - recursive dependency" error in `CArrayDataProvider` (kf99916, andrewnester) - Bug #4069: Fixed error with `eCRedisCache::executeCommand()` when the previous connection timeout exception was catched (taobig) +- Bug #4104: Fixed PHP 7 compatibiltiy in Text_Highlighter (samdark) +- Bug #4111: Fixed PHP 7.1 incompatibility with CFileCache when `$embedExpiry=false` (cebe) +- Chg #4033: Updated Pear/Text used by Gii so it's PHP 7 compatible (samdark) - Chg #4103: Updated HTMLPurifier to version 4.8.0 (samdark) - Chg: Updated Text_Highlighter to version 0.7.3 (samdark) -- Bug #4104: Fixed PHP 7 compatibiltiy in Text_Highlighter (samdark) Version 1.1.17 January 13, 2016 ------------------------------ diff --git a/framework/caching/CFileCache.php b/framework/caching/CFileCache.php index 330e74d4d..6ecff4864 100644 --- a/framework/caching/CFileCache.php +++ b/framework/caching/CFileCache.php @@ -130,7 +130,7 @@ class CFileCache extends CCache { $cacheFile=$this->getCacheFile($key); if(($time=$this->filemtime($cacheFile))>time()) - return @file_get_contents($cacheFile,false,null,$this->embedExpiry ? 10 : -1); + return @file_get_contents($cacheFile,false,null,$this->embedExpiry ? 10 : null); elseif($time>0) @unlink($cacheFile); return false;