Improved nav() performance for non-editor reads

Author: aimeos

core/src/Models/Page.php

@@ -337,7 +337,7 @@ public function menu() : DescendantsRelation
      */
     public function nav( $level = 0 ) : \Aimeos\Nestedset\Collection
     {
-        return ( clone $this->ancestors )->push( $this ) // @phpstan-ignore-line property.notFound
+        return collect( $this->ancestors )->push( $this )
             ->skip( $level )->first()
             ?->subtree?->toTree()
             ?? new \Aimeos\Nestedset\Collection();
@@ -416,13 +416,19 @@ public function subtree() : DescendantsRelation
         // restrict maximum depth to three levels for performance reasons
         $maxDepth = ( $this->depth ?? 0 ) + config( 'cms.navdepth', 2 );
 
-        $builder = $this->newScopedQuery()->with( 'latest' )
+        $isEditor = \Aimeos\Cms\Permission::can( 'page:view', Auth::user() );
+
+        $builder = $this->newScopedQuery()
             ->select( 'id', 'parent_id', '_lft', '_rgt', 'depth', 'name', 'title', 'tag', 'path', 'domain', 'lang', 'to', 'status', 'config' )
             ->whereIn( 'depth', range( 0, $maxDepth ) )
             ->defaultOrder()
             ->setModel(new Nav());
 
-        if( !\Aimeos\Cms\Permission::can( 'page:view', Auth::user() ) )
+        if( $isEditor ) {
+            $builder->with( 'latest' );
+        }
+
+        if( !$isEditor )
         {
             $table = $this->getTable();