diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-14 23:03:27 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-14 23:03:27 +0100 |
| commit | 9fac95c2ab46a734607657bbad6f164aaa61286f (patch) | |
| tree | fc035f83bc812fd4b2f36427bb130ddabf71433e /lib/private/response.php | |
| parent | b330d07b51a983dc563a91244a3c83e691c9e97d (diff) | |
| parent | df282d9ef8e040833574fac5c5fd3cbbae1b3209 (diff) | |
| download | nextcloud-server-9fac95c2ab46a734607657bbad6f164aaa61286f.tar.gz nextcloud-server-9fac95c2ab46a734607657bbad6f164aaa61286f.zip | |
Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
lib/private/appconfig.php
Diffstat (limited to 'lib/private/response.php')
| -rw-r--r-- | lib/private/response.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/response.php b/lib/private/response.php index 5e941acbb4b..71c538fb311 100644 --- a/lib/private/response.php +++ b/lib/private/response.php @@ -153,7 +153,11 @@ class OC_Response { * @param string $type disposition type, either 'attachment' or 'inline' */ static public function setContentDispositionHeader( $filename, $type = 'attachment' ) { - if (OC_Request::isUserAgent(array(OC_Request::USER_AGENT_IE, OC_Request::USER_AGENT_ANDROID_MOBILE_CHROME))) { + if (OC_Request::isUserAgent(array( + OC_Request::USER_AGENT_IE, + OC_Request::USER_AGENT_ANDROID_MOBILE_CHROME, + OC_Request::USER_AGENT_FREEBOX + ))) { header( 'Content-Disposition: ' . rawurlencode($type) . '; filename="' . rawurlencode( $filename ) . '"' ); } else { header( 'Content-Disposition: ' . rawurlencode($type) . '; filename*=UTF-8\'\'' . rawurlencode( $filename ) |