adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix MediaView extension handling as documented and expected.

Browse source
This commit is contained in:
Mark Scherer 2015-08-21 12:35:49 +02:00
parent 0df0f1a559
commit f154a8f4d7
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Cake/View/MediaView.php
View file

@ -65,7 +65,7 @@ class MediaView extends View {
* @return void * @return void
*/ */
public function render($view = null, $layout = null) { public function render($view = null, $layout = null) {
$name = $download = $id = $modified = $path = $cache = $mimeType = $compress = null; $name = $extension = $download = $id = $modified = $path = $cache = $mimeType = $compress = null;
extract($this->viewVars, EXTR_OVERWRITE); extract($this->viewVars, EXTR_OVERWRITE);
$path = $path . $id; $path = $path . $id;
@ -86,7 +86,12 @@ class MediaView extends View {
} }
if ($name !== null) { if ($name !== null) {
$name .= '.' . pathinfo($id, PATHINFO_EXTENSION); if (empty($extension)) {
$extension = pathinfo($id, PATHINFO_EXTENSION);
}
if (!empty($extension)) {
$name .= '.' . $extension;
}
} }
$this->response->file($path, compact('name', 'download')); $this->response->file($path, compact('name', 'download'));