aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Getfile.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-09-06 19:59:07 -0700
committerzotlabs <mike@macgirvin.com>2017-09-06 19:59:07 -0700
commit5877e28d729489a9ba75397bcbe86c8a811c87e8 (patch)
tree9164526f92eac5f345fd96c8c2d8291aad4496e6 /Zotlabs/Module/Getfile.php
parent9ca7cc565b1821c3f121e568b59bdebe8899eed8 (diff)
parent643f515eaf21c05e03f0f51a332c18e0acdc403d (diff)
downloadvolse-hubzilla-5877e28d729489a9ba75397bcbe86c8a811c87e8.tar.gz
volse-hubzilla-5877e28d729489a9ba75397bcbe86c8a811c87e8.tar.bz2
volse-hubzilla-5877e28d729489a9ba75397bcbe86c8a811c87e8.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Getfile.php')
-rw-r--r--Zotlabs/Module/Getfile.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php
index 0b05d78a4..413a68e0c 100644
--- a/Zotlabs/Module/Getfile.php
+++ b/Zotlabs/Module/Getfile.php
@@ -108,7 +108,7 @@ class Getfile extends \Zotlabs\Web\Controller {
$unsafe_types = array('text/html','text/css','application/javascript');
- if(in_array($r['data']['filetype'],$unsafe_types)) {
+ if(in_array($r['data']['filetype'],$unsafe_types) && (! channel_codeallowed($channel['channel_id']))) {
header('Content-type: text/plain');
}
else {