summaryrefslogtreecommitdiffstats
path: root/lib/public
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-01-09 13:54:58 +0100
committerRobin Appelman <icewind@owncloud.com>2014-01-09 13:54:58 +0100
commit5d456c7cc21f7640435c4638932984a52b4cdbac (patch)
tree0227a865782fab4895f602a7c118d92e21998cbb /lib/public
parentd50c7391d8e78c9555b073fb9ccc6a91d5da34bc (diff)
parentd8b8abb429d3d66598a16d25cf55f7dc19e3f996 (diff)
downloadnextcloud-server-5d456c7cc21f7640435c4638932984a52b4cdbac.tar.gz
nextcloud-server-5d456c7cc21f7640435c4638932984a52b4cdbac.zip
Merge branch 'master' into memcache-public
Diffstat (limited to 'lib/public')
-rw-r--r--lib/public/response.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/public/response.php b/lib/public/response.php
index 2ca0a0c9fa4..24d3c81d628 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -55,6 +55,15 @@ class Response {
}
/**
+ * Sets the content disposition header (with possible workarounds)
+ * @param string $filename file name
+ * @param string $type disposition type, either 'attachment' or 'inline'
+ */
+ static public function setContentDispositionHeader( $filename, $type = 'attachment' ) {
+ \OC_Response::setContentDispositionHeader( $filename, $type );
+ }
+
+ /**
* Disable browser caching
* @see enableCaching with cache_time = 0
*/