@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | $this->setKnpMenu($this->factory->createItem('root')); |
| 147 | 147 | |
| 148 | 148 | $menu = $this->entityManager |
| 149 | - ->getRepository('AlpixelMenuBundle:Menu') |
|
| 150 | - ->findOneMenuByMachineNameAndLocale($machineName, $locale); |
|
| 149 | + ->getRepository('AlpixelMenuBundle:Menu') |
|
| 150 | + ->findOneMenuByMachineNameAndLocale($machineName, $locale); |
|
| 151 | 151 | |
| 152 | 152 | $items = $menu->getItems()->toArray(); |
| 153 | 153 | |
@@ -176,8 +176,8 @@ discard block |
||
| 176 | 176 | if (($uri = $item->getUri()) !== null) { |
| 177 | 177 | if($uri[0] == '/') { |
| 178 | 178 | $baseUri = $this->request->getBasePath(). |
| 179 | - $this->request->getBaseURL(). |
|
| 180 | - $uri; |
|
| 179 | + $this->request->getBaseURL(). |
|
| 180 | + $uri; |
|
| 181 | 181 | $uri = $this->request->getSchemeAndHttpHost().$baseUri; |
| 182 | 182 | |
| 183 | 183 | if ($baseUri === $this->currentUri) { |
@@ -174,11 +174,11 @@ |
||
| 174 | 174 | $menuItem = ($parent === null) ? $knpMenu->addChild($item) : $parent->addChild($item); |
| 175 | 175 | |
| 176 | 176 | if (($uri = $item->getUri()) !== null) { |
| 177 | - if($uri[0] == '/') { |
|
| 178 | - $baseUri = $this->request->getBasePath(). |
|
| 179 | - $this->request->getBaseURL(). |
|
| 177 | + if ($uri[0] == '/') { |
|
| 178 | + $baseUri = $this->request->getBasePath() . |
|
| 179 | + $this->request->getBaseURL() . |
|
| 180 | 180 | $uri; |
| 181 | - $uri = $this->request->getSchemeAndHttpHost().$baseUri; |
|
| 181 | + $uri = $this->request->getSchemeAndHttpHost() . $baseUri; |
|
| 182 | 182 | |
| 183 | 183 | if ($baseUri === $this->currentUri) { |
| 184 | 184 | $menuItem->setCurrent(true); |