mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 00:35:30 +00:00
get rid of some more deprecated uses of $a
This commit is contained in:
parent
bfd506f184
commit
a20fd4d463
3 changed files with 7 additions and 9 deletions
|
@ -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'");
|
$this->server->httpResponse->setHeader('Content-Security-Policy', "script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
|
||||||
construct_page($a);
|
construct_page();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -133,7 +133,7 @@ class WebServer {
|
||||||
|
|
||||||
call_hooks('page_end', \App::$page['content']);
|
call_hooks('page_end', \App::$page['content']);
|
||||||
|
|
||||||
construct_page($a);
|
construct_page();
|
||||||
|
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
12
boot.php
12
boot.php
|
@ -2018,7 +2018,7 @@ function curPageURL() {
|
||||||
*
|
*
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
function get_custom_nav(&$a, $navname) {
|
function get_custom_nav($navname) {
|
||||||
if (! $navname)
|
if (! $navname)
|
||||||
return App::$page['nav'];
|
return App::$page['nav'];
|
||||||
// load custom nav menu by name here
|
// 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
|
* If there is no parsed Comanche template already load a module's pdl file
|
||||||
* and parse it with Comanche.
|
* and parse it with Comanche.
|
||||||
*
|
*
|
||||||
* @param App &$a global application object
|
|
||||||
*/
|
*/
|
||||||
function load_pdl() {
|
function load_pdl() {
|
||||||
|
|
||||||
|
@ -2059,7 +2058,7 @@ function load_pdl() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function exec_pdl(&$a) {
|
function exec_pdl() {
|
||||||
if(App::$pdl) {
|
if(App::$pdl) {
|
||||||
App::$comanche->parse(App::$pdl,1);
|
App::$comanche->parse(App::$pdl,1);
|
||||||
}
|
}
|
||||||
|
@ -2071,11 +2070,10 @@ function exec_pdl(&$a) {
|
||||||
*
|
*
|
||||||
* Build the page - now that we have all the components
|
* 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);
|
$comanche = ((count(App::$layout)) ? true : false);
|
||||||
|
|
||||||
|
@ -2091,7 +2089,7 @@ function construct_page(&$a) {
|
||||||
|
|
||||||
if ($comanche) {
|
if ($comanche) {
|
||||||
if (App::$layout['nav']) {
|
if (App::$layout['nav']) {
|
||||||
App::$page['nav'] = get_custom_nav($a, App::$layout['nav']);
|
App::$page['nav'] = get_custom_nav(App::$layout['nav']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue