Selaa lähdekoodia

Fix array merge navbar - skip assoc key urls

double-navbar
Ruben De Baets 2 vuotta sitten
vanhempi
commit
7d07cc78bb
3 muutettua tiedostoa jossa 6 lisäystä ja 10 poistoa
  1. 2
    2
      public/index.php
  2. 3
    7
      src/View/Twig.php
  3. 1
    1
      templates/navbar.html.twig

+ 2
- 2
public/index.php Näytä tiedosto

@@ -51,7 +51,7 @@ function addNavbar($twig)
["link" => "https://www.facebook.com", "name" => "Facebook"],
["link" => "https://www.twiter.com", "name" => "Twitter"]
];
$twig->addBlockVariable('navbar', ['urls' => $urls]);
$twig->addBlockVariable('navbar', $urls);
}


@@ -62,7 +62,7 @@ function addNavbar2($twig)
["link" => "https://www.facebook.com", "name" => "Apple"],
["link" => "https://www.twiter.com", "name" => "TikTok"]
];
$twig->addBlockVariable('navbar', ['urls' => $urls]);
$twig->addBlockVariable('navbar', $urls);
}

function addFooter($response)

+ 3
- 7
src/View/Twig.php Näytä tiedosto

@@ -33,13 +33,9 @@ class Twig
// add block variables to the global variable bag
public function addBlockVariable($block, $data)
{
$current = $this->variables[$block]['urls'];
if ($current) {
$new = array_merge($current, $data['urls']);
} else {
$new = $data['urls'];
}
$this->variables[$block]['urls'] = $new;
$current = $this->variables[$block];
$new = array_merge($current, $data);
$this->variables[$block] = $new;
}

public function render($tmpl, $vars)

+ 1
- 1
templates/navbar.html.twig Näytä tiedosto

@@ -1,6 +1,6 @@
<div>
<ul>
{% for url in navbar.urls %}
{% for url in navbar %}
<li>
<a href="{{ url.link }}">{{ url.name }} </a>
</li>

Loading…
Peruuta
Tallenna