summaryrefslogtreecommitdiffstats
path: root/lib/private/files.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-02-14 23:03:27 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-02-14 23:03:27 +0100
commit9fac95c2ab46a734607657bbad6f164aaa61286f (patch)
treefc035f83bc812fd4b2f36427bb130ddabf71433e /lib/private/files.php
parentb330d07b51a983dc563a91244a3c83e691c9e97d (diff)
parentdf282d9ef8e040833574fac5c5fd3cbbae1b3209 (diff)
downloadnextcloud-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/files.php')
-rw-r--r--lib/private/files.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files.php b/lib/private/files.php
index 6fb7d9ff41d..4a6b9d8ca0e 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -131,7 +131,7 @@ class OC_Files {
}
if ($xsendfile) {
list($storage) = \OC\Files\Filesystem::resolvePath(\OC\Files\Filesystem::getView()->getAbsolutePath($filename));
- if ($storage instanceof \OC\Files\Storage\Local) {
+ if ($storage->isLocal()) {
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
}
}