summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-03-15 11:26:01 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2013-03-15 11:26:01 +0100
commit5d471872cf8ef462d54474f2b70877f1a6074bbd (patch)
tree1394f5ceb29f5145b2b221b5dc8afd59621f1135
parentbdbbec5781db6cd74bf74c44920ed10c0feaa344 (diff)
downloadsymfony-security-5d471872cf8ef462d54474f2b70877f1a6074bbd.zip
symfony-security-5d471872cf8ef462d54474f2b70877f1a6074bbd.tar.gz
symfony-security-5d471872cf8ef462d54474f2b70877f1a6074bbd.tar.bz2
fixed merge issue
-rw-r--r--Http/HttpUtils.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/HttpUtils.php b/Http/HttpUtils.php
index 28373a7..24fec0d 100644
--- a/Http/HttpUtils.php
+++ b/Http/HttpUtils.php
@@ -140,7 +140,7 @@ class HttpUtils
throw new \LogicException('You must provide a UrlGeneratorInterface instance to be able to use routes.');
}
- $url = $this->urlGenerator->generate($path, $attributes, UrlGeneratorInterface::ABSOLUTE_URL);
+ $url = $this->urlGenerator->generate($path, $request->attributes->all(), UrlGeneratorInterface::ABSOLUTE_URL);
// unnecessary query string parameters must be removed from url
// (ie. query parameters that are presents in $attributes)