Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Chaging array_push call for array_merge, as the first one would produ…

…ce worng nested arrays in MediaView. closes #391
  • Loading branch information...
commit 93ac79d4fbeb014286ff797889e76766d3aa1023 1 parent 0f876e1
@lorenzo lorenzo authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  cake/libs/view/media.php
View
2  cake/libs/view/media.php
@@ -154,7 +154,7 @@ function render() {
$contentTypes[0] = 'application/octetstream';
} else if (preg_match('/MSIE ([0-9].[0-9]{1,2})/', $agent)) {
$contentTypes[0] = 'application/force-download';
- array_push($contentTypes, array(
+ array_merge($contentTypes, array(
'application/octet-stream',
'application/download'
));
Please sign in to comment.
Something went wrong with that request. Please try again.