Simplify code.

cakephp · Oct 5, 2016 · f9e3b56 · f9e3b56
1 parent 27db868
commit f9e3b56
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/src/View/Helper/BreadcrumbsHelper.php b/src/View/Helper/BreadcrumbsHelper.php
@@ -218,24 +218,15 @@ public function render(array $attributes = [], array $separator = [])
         $crumbsCount = count($crumbs);
         $templater = $this->templater();
 
-        $separatorParams = [];
         if ($separator) {
             if (isset($separator['innerAttrs'])) {
-                $separatorParams['innerAttrs'] = $templater->formatAttributes($separator['innerAttrs']);
-                unset($separator['innerAttrs']);
+                $separator['innerAttrs'] = $templater->formatAttributes($separator['innerAttrs']);
             }
 
-            if (isset($separator['separator'])) {
-                $separatorParams['separator'] = $separator['separator'];
-                unset($separator['separator']);
-            }
-
-            if (isset($separator['templateVars'])) {
-                $separatorParams['templateVars'] = $separator['templateVars'];
-                unset($separator['templateVars']);
-            }
-
-            $separatorParams['attrs'] = $templater->formatAttributes($separator);
+            $separator['attrs'] = $templater->formatAttributes(
+                $separator,
+                ['innerAttrs', 'separator']
+            );
         }
 
         $crumbTrail = '';
@@ -264,8 +255,8 @@ public function render(array $attributes = [], array $separator = [])
                 $template = 'itemWithoutLink';
             }
 
-            if ($separatorParams && $key !== ($crumbsCount - 1)) {
-                $templateParams['separator'] = $this->formatTemplate('separator', $separatorParams);
+            if ($separator && $key !== ($crumbsCount - 1)) {
+                $templateParams['separator'] = $this->formatTemplate('separator', $separator);
             }
 
             $crumbTrail .= $this->formatTemplate($template, $templateParams);