Merge branch '6.10'

ezecosystem · Jul 26, 2017 · 745b87c · 745b87c
2 parents e57d4d4 + 4258e0c
commit 745b87c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Routing/DefaultRouter.php b/eZ/Bundle/EzPublishCoreBundle/Routing/DefaultRouter.php
@@ -16,6 +16,7 @@
 use eZ\Publish\Core\MVC\Symfony\SiteAccess\URILexer;
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 
 /**
@@ -95,7 +96,13 @@ public function generate($name, $parameters = array(), $referenceType = self::AB
             unset($parameters['siteaccess']);
         }
 
-        $url = parent::generate($name, $parameters, $referenceType);
+        try {
+            $url = parent::generate($name, $parameters, $referenceType);
+        } catch (RouteNotFoundException $e) {
+            // Switch back to original context, for next links generation.
+            $this->setContext($originalContext);
+            throw $e;
+        }
 
         // Now putting back SiteAccess URI if needed.
         if ($isSiteAccessAware && $siteAccess && $siteAccess->matcher instanceof URILexer) {