Display site logo in sidebar instead of branding

givanz · givanz · commit f9a9d97b4a9c · 2024-07-01T01:19:31.000+03:00
diff --git a/app/template/components/site.tpl b/app/template/components/site.tpl
@@ -2,7 +2,6 @@
 	if (isset($_site_idx)) $_site_idx++; else $_site_idx = 0;
 	$previous_component = isset($component)?$component:null;
 	$site = $component = $this->_component['site'][$_site_idx] ?? [];
-	//$site = \Vvveb\session('site');
 ?>
 
 [data-v-component-site] [data-v-site-description-*]|innerText = $site['description']['@@__data-v-site-description-(*)__@@']
@@ -27,4 +26,4 @@ echo $site['description'][$name] ?? '';
 
 [data-v-component-site]|append = <?php 
 	$component = $previous_component;
-?>
+?>
diff --git a/public/admin/default b/public/admin/default
@@ -1 +1 @@
-Subproject commit dbb380e9f0ee7e7b72fdc4917e63786ddeeaf116
+Subproject commit 44f15953925614db3af6a98e678653bafedd1ac1
diff --git a/system/component/component-base.php b/system/component/component-base.php
@@ -46,7 +46,7 @@ function __construct($options = []) {
 		if (! self :: $global) {
 			$user                                  = User::current();
 			self :: $global['start']               = 0;
-			self :: $global['site_id']             = defined('SITE_ID') ? SITE_ID : 0;
+			self :: $global['site_id']             = sess('site_id') ?? (defined('SITE_ID') ? SITE_ID : 0);
 			self :: $global['user_id']             = $user['user_id'] ?? null;
 			self :: $global['user_group_id']       = $user['user_group_id'] ?? 1;
 			self :: $global['language_id']         = $request->request['language_id'] ?? sess('language_id') ?? 1;
