Parcourir la source

[Routing] fixed a warning when using a sub-class of UrlGenerator

Fabien Potencier il y a 15 ans
Parent
commit
bfef03a1cb
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2 2
      src/Symfony/Components/Routing/Generator/UrlGenerator.php

+ 2 - 2
src/Symfony/Components/Routing/Generator/UrlGenerator.php

@@ -38,7 +38,7 @@ class UrlGenerator implements UrlGeneratorInterface
   public function __construct(RouteCollection $routes, array $context = array(), array $defaults = array())
   {
     $this->routes = $routes;
-    $this->context = array_merge(array('base_url' => ''), $context);
+    $this->context = $context;
     $this->defaults = $defaults;
     $this->cache = array();
   }
@@ -123,7 +123,7 @@ class UrlGenerator implements UrlGeneratorInterface
       $url .= '?'.http_build_query($extra);
     }
 
-    $url = $this->context['base_url'].$url;
+    $url = (isset($this->context['base_url']) ? $this->context['base_url'] : '').$url;
 
     if ($absolute && isset($this->context['host']))
     {