Prevent exception if logged in customer is from another site

aimeos · Aug 31, 2022 · 6ca0345 · 6ca0345
1 parent 30fdbd4
commit 6ca0345
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/MShop/Common/Manager/Site.php b/src/MShop/Common/Manager/Site.php
@@ -100,11 +100,15 @@ protected function siteInactive( string $current ) : \Aimeos\Map
 
 			if( ( $userId = $this->context()->user() ) )
 			{
-				$siteId = \Aimeos\MShop::create( $this->context(), 'customer' )->get( $userId )->getSiteId();
-
-				$sites = $sites->filter( function( $item ) use ( $siteId ) {
-					return strncmp( $item, $siteId, strlen( $siteId ) );
-				} );
+				$manager = \Aimeos\MShop::create( $this->context(), 'customer' );
+				$custItems = $manager->search( $manager->filter()->add( ['customer.id' => $userId] ) );
+
+				if( $siteId = $custItems->getSiteId()->first() )
+				{
+					$sites = $sites->filter( function( $item ) use ( $siteId ) {
+						return strncmp( $item, $siteId, strlen( $siteId ) );
+					} );
+				}
 			}
 
 			self::$siteInactive[$current] = $sites;