Fixed equalIndex iteration

- Fixed recently introduced equalIndex iteration in admin context - Reduced lines of code in frontend context
luyadev · Feb 5, 2024 · fac9cdf · fac9cdf
1 parent 4f5d83f
commit fac9cdf
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/models/NavItemPage.php b/src/models/NavItemPage.php
@@ -298,13 +298,7 @@ private function renderPlaceholderRecursive($navItemPageId, $placeholderVar, $pr
                     $prevIsEqual = array_key_exists($prev, $placeholders) && $placeholder['block_id'] == $placeholders[$prev]['block_id'];
                     $blockObject->setEnvOption('isPrevEqual', $prevIsEqual);
                     $blockObject->setEnvOption('isNextEqual', array_key_exists($next, $placeholders) && $placeholder['block_id'] == $placeholders[$next]['block_id']);
-
-                    if (!$prevIsEqual) {
-                        $equalIndex = 1;
-                    } else {
-                        $equalIndex++;
-                    }
-                    $blockObject->setEnvOption('equalIndex', $equalIndex);
+                    $blockObject->setEnvOption('equalIndex', (!$prevIsEqual) ? $equalIndex = 1 : ++$equalIndex);
 
                     // render sub placeholders and set into object
                     $insertedHolders = [];
@@ -449,7 +443,7 @@ public static function getPlaceholder($placeholderVar, $prevId, NavItemPage $nav
                 'isLast' => ($i == $blocksCount),
                 'isPrevEqual' => $prevIsEqual,
                 'isNextEqual' => array_key_exists($next, $nav_item_page_block_item_data) && $blockItem['block_id'] == $nav_item_page_block_item_data[$next]['block_id'],
-                'equalIndex' => (!$prevIsEqual) ? ($equalIndex = 1) : ($equalIndex++)
+                'equalIndex' => (!$prevIsEqual) ? $equalIndex = 1 : ++$equalIndex
             ];
 
             $item = self::getBlockItem($blockItem, $navItemPage, $envOptions);