Merge branch 'backport-8741-8690' into 2.x

This commit is contained in:
Philippe Saint-Just 2016-04-30 13:11:34 -04:00
parent 0934d02f0e
commit cd07850337
3 changed files with 8 additions and 2 deletions

View file

@ -132,7 +132,7 @@ class FileEngine extends CacheEngine {
}
$expires = time() + $duration;
$contents = $expires . $lineBreak . $data . $lineBreak;
$contents = implode([$expires, $lineBreak, $data, $lineBreak]);
if ($this->settings['lock']) {
$this->_File->flock(LOCK_EX);