aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-25 21:32:40 -0700
committerredmatrix <git@macgirvin.com>2016-05-25 21:32:40 -0700
commit30d0f210797b6229a0d127a9c359136bf3a87d42 (patch)
tree81aea51b8d9f00a734ce927b6e559469da160144 /Zotlabs
parentd78bc12cbe5ff73238eb99818c42f3f35a21f35f (diff)
parent2a9c1db0c9bd9927598bf082a9da501264ba4c8e (diff)
downloadvolse-hubzilla-30d0f210797b6229a0d127a9c359136bf3a87d42.tar.gz
volse-hubzilla-30d0f210797b6229a0d127a9c359136bf3a87d42.tar.bz2
volse-hubzilla-30d0f210797b6229a0d127a9c359136bf3a87d42.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Cloud.php3
-rw-r--r--Zotlabs/Storage/Browser.php1
2 files changed, 4 insertions, 0 deletions
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php
index d9b0c47d4..b691475ce 100644
--- a/Zotlabs/Module/Cloud.php
+++ b/Zotlabs/Module/Cloud.php
@@ -100,9 +100,12 @@ class Cloud extends \Zotlabs\Web\Controller {
// require_once('\Zotlabs\Storage/QuotaPlugin.php');
// $server->addPlugin(new \Zotlabs\Storage\\QuotaPlugin($auth));
+ ob_start();
// All we need to do now, is to fire up the server
$server->exec();
+ ob_end_flush();
+
killme();
}
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index 3556f7f06..f875cbf33 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -256,6 +256,7 @@ class Browser extends DAV\Browser\Plugin {
$func($a);
}
}
+ $this->server->httpResponse->setHeader('Content-Security-Policy', "script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
construct_page($a);
}