hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3879 from alchemy-fr/PHRAS-3541-rotation-nok

Browse Source 
PHRAS-3541 merge prod - Image rotation NOK - ETAG is not renew - File is correctly rotated but not invalidate in browser cache.
This commit is contained in:
Nicolas Maillat
2021-10-15 11:44:06 +02:00
committed by GitHub
parent 534da757a9 18fcbfbfe0
commit 60b0b420ad
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/classes/media/subdef.php
View File

@@ -362,11 +362,10 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
public function getEtag()
{
if (!$this->etag && $this->is_physically_present()) {
if ((!$this->etag && $this->is_physically_present())) {
$file = new SplFileInfo($this->getRealPath());
if ($file->isFile()) {
$this->setEtag(md5($file->getRealPath() . $file->getMTime()));
$this->generateEtag($file);
}
}
@@ -573,7 +572,11 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
$this->width = $media->getWidth();
$this->height = $media->getHeight();
return $this->save();
// generate a new etag after rotation
$file = new SplFileInfo($this->getRealPath());
$this->generateEtag($file); // with repository save
return $this;
}
/**
@@ -799,6 +802,14 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
return $this->app['phraseanet.h264']->getUrl($this->getRealPath());
}
/**
* @param SplFileInfo $file
*/
private function generateEtag(SplFileInfo $file)
{
$this->setEtag(md5($file->getRealPath() . $file->getMTime()));
}
/**
* @return $this
*/