Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

avoid php notices where key is not defined

givanz2a0d59618c1f
diff --git a/admin/controller/base.php b/admin/controller/base.php
index d436316..b0ecf1d 100755
--- a/admin/controller/base.php
+++ b/admin/controller/base.php
@@ -36,6 +36,7 @@ use Vvveb\System\Core\View;
use Vvveb\System\Event;
use Vvveb\System\Extensions\Plugins;
use Vvveb\System\Functions\Str;
+use Vvveb\System\PageCache;
use Vvveb\System\Session;
use Vvveb\System\Sites;
use Vvveb\System\User\Admin;
@@ -290,9 +291,6 @@ class Base {
clearLanguageCache($language);
}
- $view = $this->view;
- $view->languagesList = $languages;
-
$default_language = $this->session->get('default_language') ?? $default_language = $defaultLanguage;
$default_language_id = $this->session->get('default_language_id') ?? $default_language_id = $defaultLanguageId;
$language = $this->session->get('language') ?? $language = $default_language;
@@ -341,6 +339,11 @@ class Base {
$this->global['default_language_id'] = $default_language_id;
setLanguage($language);
+
+ if (! defined('CLI')) {
+ $view = $this->view;
+ $view->languagesList = $languages;
+ }
}
protected function currency($defaultCurrency, $defaultCurrencyId) {
@@ -499,6 +502,7 @@ class Base {
if ($stop) {
$this->session->close();
FrontController::closeConnections();
+ PageCache::getInstance()->cleanUp();
die();
}
diff --git a/admin/controller/tools/systeminfo.php b/admin/controller/tools/systeminfo.php
index 26027a8..d26be43 100755
--- a/admin/controller/tools/systeminfo.php
+++ b/admin/controller/tools/systeminfo.php
@@ -61,6 +61,9 @@ class SystemInfo extends Base {
__('PHP post max size') => ini_get('post_max_size'),
__('Extensions') => implode(' ', get_loaded_extensions()),
__('Page cache') => (defined('PAGE_CACHE') && PAGE_CACHE) ? __('enabled') : __('disabled'),
+ __('Object cache') => \Vvveb\get_config('app.cache.driver'),
+ __('Email Driver') => \Vvveb\get_config('app.email.driver'),
+ __('Session Driver') => \Vvveb\get_config('app.session.driver'),
__('Debug') => DEBUG ? __('enabled') : __('disabled'),
__('Sql changes check') => SQL_CHECK ? __('enabled') : __('disabled'),
],
diff --git a/system/core/frontcontroller.php b/system/core/frontcontroller.php
index 786b3eb..939039a 100755
--- a/system/core/frontcontroller.php
+++ b/system/core/frontcontroller.php
@@ -143,7 +143,7 @@ class FrontController {
//return $response->output();
PageCache::getInstance()->cleanUp();
- $view->render(false, true, $service);
+ $view->render($service, true, $service);
die();
//self :: closeConnections();
diff --git a/system/sites.php b/system/sites.php
index 5084a30..d32cf9a 100755
--- a/system/sites.php
+++ b/system/sites.php
@@ -113,7 +113,7 @@ class Sites {
}
public static function urlSplit($url = null) {
- $url = $url ?? $_SERVER['HTTP_HOST'];
+ $url = $url ?? $_SERVER['HTTP_HOST'] ?? '';
$host = $host ?? self :: getHost();
$host_matches = self :: $host_matches[$host] ?? [];
diff --git a/system/update.php b/system/update.php
index 77e1bef..b94877d 100755
--- a/system/update.php
+++ b/system/update.php
@@ -56,7 +56,7 @@ class Update {
$info = json_decode($result, true);
if ($type == 'core') {
- $info['hasUpdate'] = max(version_compare($info['version'], V_VERSION), 0);
+ $info['hasUpdate'] = max(version_compare($info['version'] ?? 0, V_VERSION), 0);
}
return $info;