From c5828fecc1fadb4db705bbf94edfa7ff873b491a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 28 Mar 2017 16:02:47 -0700 Subject: get rid of get_app() --- Zotlabs/Storage/Browser.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Storage/Browser.php') diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 3fdc8e9d4..c501379d8 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -84,7 +84,6 @@ class Browser extends DAV\Browser\Plugin { require_once('include/conversation.php'); require_once('include/text.php'); if ($this->auth->owner_nick) { - //$html = profile_tabs(get_app(), (($is_owner) ? true : false), $this->auth->owner_nick); $html = ''; } @@ -241,7 +240,9 @@ class Browser extends DAV\Browser\Plugin { '$nick' => $this->auth->getCurrentUser() )); - $a = get_app(); + + $a = false; + \App::$page['content'] = $html; load_pdl($a); -- cgit v1.2.3 From 046e5e239fd28996f8c658900a83c33dbe0011ba Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 28 Mar 2017 16:07:22 -0700 Subject: remove obsolete app argument from load_pdl --- Zotlabs/Storage/Browser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Storage/Browser.php') diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index c501379d8..b7d90b237 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -244,7 +244,7 @@ class Browser extends DAV\Browser\Plugin { $a = false; \App::$page['content'] = $html; - load_pdl($a); + load_pdl(); $current_theme = \Zotlabs\Render\Theme::current(); -- cgit v1.2.3 From 323ab3dba4a925cf2519c5c9eee9b82683dc7d5d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 28 Mar 2017 17:00:44 -0700 Subject: get rid of some more deprecated uses of $a --- Zotlabs/Storage/Browser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Storage/Browser.php') diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index b7d90b237..7162161ef 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -257,7 +257,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($a); + construct_page(); } /** -- cgit v1.2.3 From 5dc638c5b38883934221b3575b7d21e32502512b Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 26 Jun 2017 01:36:33 -0700 Subject: better fix for dav headers already sent issue --- Zotlabs/Storage/Browser.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Storage/Browser.php') 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; } /** -- cgit v1.2.3 From 27678a523c4c02bf4e3b31bf4ac01413feaf3759 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Fri, 21 Jul 2017 22:36:47 +0200 Subject: more nav_set_selected apps --- Zotlabs/Storage/Browser.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Zotlabs/Storage/Browser.php') diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 9dc393167..3af9fcab1 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -244,6 +244,8 @@ class Browser extends DAV\Browser\Plugin { $a = false; + nav_set_selected(t('Files')); + \App::$page['content'] = $html; load_pdl(); -- cgit v1.2.3