X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Flib%2FDrupal%2FCore%2FParamConverter%2FParamConverterManager.php;h=944bd5304c9d802dd031898167a87b0ccba099dc;hb=4f1b9b4ab48a8498afac9e2213a02a23ccf4a06c;hp=cad7609c83bb663f3339b6dee8dd7b139170bdea;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php b/web/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
index cad7609c8..944bd5304 100644
--- a/web/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
+++ b/web/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
@@ -96,9 +96,12 @@ class ParamConverterManager implements ParamConverterManagerInterface {
 
       // If a converter returns NULL it means that the parameter could not be
       // converted.
-      $defaults[$name] = $this->getConverter($definition['converter'])->convert($defaults[$name], $definition, $name, $defaults);
+      $value = $defaults[$name];
+      $defaults[$name] = $this->getConverter($definition['converter'])->convert($value, $definition, $name, $defaults);
       if (!isset($defaults[$name])) {
-        throw new ParamNotConvertedException(sprintf('The "%s" parameter was not converted for the path "%s" (route name: "%s")', $name, $route->getPath(), $defaults[RouteObjectInterface::ROUTE_NAME]));
+        $message = 'The "%s" parameter was not converted for the path "%s" (route name: "%s")';
+        $route_name = $defaults[RouteObjectInterface::ROUTE_NAME];
+        throw new ParamNotConvertedException(sprintf($message, $name, $route->getPath(), $route_name), 0, NULL, $route_name, [$name => $value]);
       }
     }