From c3aec39d75a944c2105adbaba286049e03311f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Lorenzo=20Rodr=C3=ADguez?= Date: Wed, 17 Mar 2010 10:47:03 -0430 Subject: [PATCH] Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391 --- cake/libs/view/media.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php index 71c4e43a2..f50217d8f 100644 --- a/cake/libs/view/media.php +++ b/cake/libs/view/media.php @@ -148,7 +148,7 @@ class MediaView extends View { $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' ));