diff options
| -rw-r--r-- | Zotlabs/Render/Theme.php | 9 | ||||
| -rw-r--r-- | Zotlabs/Zot6/Zot6Handler.php | 2 | ||||
| -rw-r--r-- | boot.php | 7 |
3 files changed, 14 insertions, 4 deletions
diff --git a/Zotlabs/Render/Theme.php b/Zotlabs/Render/Theme.php index 9403d21a3..2faf3631a 100644 --- a/Zotlabs/Render/Theme.php +++ b/Zotlabs/Render/Theme.php @@ -87,8 +87,13 @@ class Theme { // Find any theme at all and use it. $fallback = array_merge(glob('view/theme/*/css/style.css'), glob('view/theme/*/php/style.php')); - if(count($fallback)) - return(array(str_replace('view/theme/', '', substr($fallback[0], 0, -14)))); + + if (empty($fallback)) { + logger('Unable to find a theme'); + http_status_exit(500, 'internal server error'); + } + + return(array(str_replace('view/theme/', '', substr($fallback[0], 0, -14)))); } diff --git a/Zotlabs/Zot6/Zot6Handler.php b/Zotlabs/Zot6/Zot6Handler.php index 2ef9e3b8d..1716ff84b 100644 --- a/Zotlabs/Zot6/Zot6Handler.php +++ b/Zotlabs/Zot6/Zot6Handler.php @@ -12,7 +12,7 @@ class Zot6Handler implements IHandler { } function Rekey($sender, $data, $hub) { - return self::reply_rekey_request($sender, $data, $hub); + return self::rekey_request($sender, $data, $hub); } function Refresh($sender, $recipients, $hub, $force) { @@ -657,8 +657,10 @@ function sys_boot(): bool { // allow somebody to set some initial settings just in case they can't // install without special fiddling - if (App::$install && file_exists('.htpreconfig.php')) + if (App::$install && file_exists('.htpreconfig.php')) { + // @phpstan-ignore include.fileNotFound @include('.htpreconfig.php'); + } if (array_key_exists('default_timezone', get_defined_vars())) { App::$config['system']['timezone'] = $default_timezone; @@ -870,6 +872,9 @@ class App { */ public static $template_engine_instance = []; + /// Page layouts for comanche + public static array $page_layouts = []; + private static $ldelim = [ 'internal' => '', 'smarty3' => '{{' |