Mercurial > hg > isophonics-drupal-site

diff vendor/symfony/routing/Matcher/TraceableUrlMatcher.php @ 12:7a779792577d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Drupal core to v8.4.5 (via Composer)
author Chris Cannam
date Fri, 23 Feb 2018 15:52:07 +0000
parents 4c8ae668cc8c
children 129ea1e6d783
line wrap: on
line diff
--- a/vendor/symfony/routing/Matcher/TraceableUrlMatcher.php	Fri Feb 23 15:51:18 2018 +0000
+++ b/vendor/symfony/routing/Matcher/TraceableUrlMatcher.php	Fri Feb 23 15:52:07 2018 +0000
@@ -105,7 +105,7 @@
 
             // check condition
             if ($condition = $route->getCondition()) {
-                if (!$this->getExpressionLanguage()->evaluate($condition, array('context' => $this->context, 'request' => $this->request))) {
+                if (!$this->getExpressionLanguage()->evaluate($condition, array('context' => $this->context, 'request' => $this->request ?: $this->createRequest($pathinfo)))) {
                     $this->addTrace(sprintf('Condition "%s" does not evaluate to "true"', $condition), self::ROUTE_ALMOST_MATCHES, $name, $route);
 
                     continue;