aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-06-26 01:36:33 -0700
committerzotlabs <mike@macgirvin.com>2017-06-26 01:36:33 -0700
commit5dc638c5b38883934221b3575b7d21e32502512b (patch)
tree4454d6836d6b589621b5ea19767d89bb61839c8e
parent7f982a07781f09756d852f423bba37dc11abf2a5 (diff)
downloadvolse-hubzilla-5dc638c5b38883934221b3575b7d21e32502512b.tar.gz
volse-hubzilla-5dc638c5b38883934221b3575b7d21e32502512b.tar.bz2
volse-hubzilla-5dc638c5b38883934221b3575b7d21e32502512b.zip
better fix for dav headers already sent issue
-rw-r--r--Zotlabs/Module/Cloud.php3
-rw-r--r--Zotlabs/Storage/Browser.php3
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php
index 01f1061df..75191a279 100644
--- a/Zotlabs/Module/Cloud.php
+++ b/Zotlabs/Module/Cloud.php
@@ -91,7 +91,8 @@ class Cloud extends \Zotlabs\Web\Controller {
$server->exec();
// ob_end_flush();
-
+ if($browser->build_page)
+ construct_page();
killme();
}
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index 7162161ef..9dc393167 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -17,6 +17,7 @@ use Sabre\DAV;
*/
class Browser extends DAV\Browser\Plugin {
+ public $build_page = false;
/**
* @see set_writeable()
* @see \\Sabre\\DAV\\Auth\\Backend\\BackendInterface
@@ -257,7 +258,7 @@ class Browser extends DAV\Browser\Plugin {
}
}
$this->server->httpResponse->setHeader('Content-Security-Policy', "script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
- construct_page();
+ $this->build_page = true;
}
/**