diff options
| -rw-r--r-- | Zotlabs/Storage/Browser.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Web/WebServer.php | 2 | ||||
| -rwxr-xr-x | boot.php | 12 |
3 files changed, 7 insertions, 9 deletions
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(); } /** diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index 9c9f0483a..4e8dc6786 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -133,7 +133,7 @@ class WebServer { call_hooks('page_end', \App::$page['content']); - construct_page($a); + construct_page(); killme(); } @@ -2018,7 +2018,7 @@ function curPageURL() { * * @return mixed */ -function get_custom_nav(&$a, $navname) { +function get_custom_nav($navname) { if (! $navname) return App::$page['nav']; // load custom nav menu by name here @@ -2030,7 +2030,6 @@ function get_custom_nav(&$a, $navname) { * If there is no parsed Comanche template already load a module's pdl file * and parse it with Comanche. * - * @param App &$a global application object */ function load_pdl() { @@ -2059,7 +2058,7 @@ function load_pdl() { } -function exec_pdl(&$a) { +function exec_pdl() { if(App::$pdl) { App::$comanche->parse(App::$pdl,1); } @@ -2071,11 +2070,10 @@ function exec_pdl(&$a) { * * Build the page - now that we have all the components * - * @param App &$a global application object */ -function construct_page(&$a) { +function construct_page() { - exec_pdl($a); + exec_pdl(); $comanche = ((count(App::$layout)) ? true : false); @@ -2091,7 +2089,7 @@ function construct_page(&$a) { if ($comanche) { if (App::$layout['nav']) { - App::$page['nav'] = get_custom_nav($a, App::$layout['nav']); + App::$page['nav'] = get_custom_nav(App::$layout['nav']); } } |