fixed uri rendering condition

breadlesscode · Feb 20, 2018 · 8f48c41 · 8f48c41
1 parent 86ec7b1
commit 8f48c41
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Classes/Package/FrontendNodeRoutePartHandler.php b/Classes/Package/FrontendNodeRoutePartHandler.php
@@ -80,8 +80,7 @@ protected function findNextNodeWithPathSegmentRecursively(
                     array_unshift($relativeNodePathSegments, $node->getName());
                     return $foundNode;
                 }
-            }
-            if ($node->getProperty('uriPathSegment') === $pathSegment) {
+            } elseif ($node->getProperty('uriPathSegment') === $pathSegment) {
                 $relativeNodePathSegments[] = $node->getName();
                 return $node;
             }
@@ -115,7 +114,7 @@ protected function getRequestPathByNode(NodeInterface $node)
                 );
             }
 
-            if ($startingNode === $node || $this->shouldHideNodeUriSegement($node)) {
+            if ($startingNode === $node || !$this->shouldHideNodeUriSegement($node)) {
                 $pathSegment = $node->getProperty('uriPathSegment');
                 $requestPathSegments[] = $pathSegment;
             }
@@ -135,7 +134,7 @@ protected function getRequestPathByNode(NodeInterface $node)
     protected function shouldHideNodeUriSegement(NodeInterface $node)
     {
         return
-            !$node->hasProperty(self::MIXIN_PROPERTY_NAME) ||
-            !$node->getProperty(self::MIXIN_PROPERTY_NAME) === true;
+            $node->hasProperty(self::MIXIN_PROPERTY_NAME) &&
+            $node->getProperty(self::MIXIN_PROPERTY_NAME) === true;
     }
 }