harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct variable in boot.php

Browse Source
This commit is contained in:
Klaus Weidenbach 2019-01-28 23:10:36 +01:00
parent 671b6d2eda
commit ec6e130eb3
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
boot.php
View File

@ -733,11 +733,11 @@ class App {
private static $perms = null; // observer permissions private static $perms = null; // observer permissions
private static $widgets = array(); // widgets for this page private static $widgets = array(); // widgets for this page
public static $config = array(); // config cache public static $config = array(); // config cache
public static $override_intltext_templates = array(); public static $override_intltext_templates = array();
public static $override_markup_templates = array(); public static $override_markup_templates = array();
public static $override_templateroot = null; public static $override_templateroot = null;
public static $override_helproot = null; public static $override_helproot = null;
public static $override_helpfiles = array(); public static $override_helpfiles = array();
public static $session = null; public static $session = null;
public static $groups; public static $groups;
@ -1833,8 +1833,6 @@ function proc_run(){
$args = func_get_args(); $args = func_get_args();
$newargs = array();
if(! count($args)) if(! count($args))
return; return;
@ -2282,7 +2280,7 @@ function construct_page() {
$cspheader = "Content-Security-Policy:"; $cspheader = "Content-Security-Policy:";
foreach ($cspsettings as $cspdirective => $csp) { foreach ($cspsettings as $cspdirective => $csp) {
if (!in_array($cspdirective,$validcspdirectives)) { if (!in_array($cspdirective,$validcspdirectives)) {
logger("INVALID CSP DIRECTIVE: ".$cspdirective,LOGGER_DEBUG); logger("INVALID CSP DIRECTIVE: ".$cspdirective,LOGGER_DEBUG);
continue; continue;
} }
$cspsettingsarray=array_unique($cspsettings[$cspdirective]); $cspsettingsarray=array_unique($cspsettings[$cspdirective]);
@ -2401,7 +2399,7 @@ function z_get_temp_dir() {
if(! $temp_dir) if(! $temp_dir)
$temp_dir = sys_get_temp_dir(); $temp_dir = sys_get_temp_dir();
return $upload_dir; return $temp_dir;
} }