diff --git a/system/includes/dispatch.php b/system/includes/dispatch.php index 1e9fa9a..5758f2d 100644 --- a/system/includes/dispatch.php +++ b/system/includes/dispatch.php @@ -14,11 +14,9 @@ function _log($message) function site_url() { - if (config('multi.site') == "true"){ + if (config('multi.site') == "true" || config('site.url') == null){ return rtrim(generateSiteUrl(), '/') . '/'; } else { - if (config('site.url') == null) - error(500, '[site.url] is not set'); // Forcing the forward slash return rtrim(config('site.url'), '/') . '/'; } @@ -45,9 +43,6 @@ function site_path() { static $_path; - if (config('site.url') == null) - error(500, '[site.url] is not set'); - if (!$_path) $_path = rtrim(parse_url(site_url(), PHP_URL_PATH), '/'); diff --git a/system/includes/functions.php b/system/includes/functions.php index 540930a..afaeb7b 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -2623,6 +2623,7 @@ EOF; // The not found error function not_found() { + if (!config('views.root')) die('HTMLy is not installed!'); $vroot = rtrim(config('views.root'), '/'); $lt = $vroot . '/layout--404.html.php'; if (file_exists($lt)) { @@ -3161,8 +3162,7 @@ function head_contents() function file_cache($request) { if (config('cache.off') == 'true') return; - - $hour = str_replace(',', '.', config('cache.expiration')); + $hour = config('cache.expiration'); if (empty($hour)) { $hour = 6; }