summaryrefslogtreecommitdiffstats
path: root/Http/HttpUtils.php
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-03-15 11:54:52 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2013-03-15 11:54:52 +0100
commit580e714d0973bce6410d7351c19ddd781497b1e5 (patch)
treea82c5a03cf8fb5dfd3bfbd3cefee10dbf06a6e2d /Http/HttpUtils.php
parent5d471872cf8ef462d54474f2b70877f1a6074bbd (diff)
parent013f098cf1012f3a476b8c757a84b6fd996e45f2 (diff)
downloadsymfony-security-580e714d0973bce6410d7351c19ddd781497b1e5.zip
symfony-security-580e714d0973bce6410d7351c19ddd781497b1e5.tar.gz
symfony-security-580e714d0973bce6410d7351c19ddd781497b1e5.tar.bz2
Merge branch '2.1' into 2.2
* 2.1: changed sub-requests creation to '::create()' Conflicts: src/Symfony/Bundle/FrameworkBundle/HttpKernel.php src/Symfony/Component/Security/Http/HttpUtils.php
Diffstat (limited to 'Http/HttpUtils.php')
-rw-r--r--Http/HttpUtils.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/HttpUtils.php b/Http/HttpUtils.php
index 24fec0d..0453520 100644
--- a/Http/HttpUtils.php
+++ b/Http/HttpUtils.php
@@ -70,7 +70,7 @@ class HttpUtils
*/
public function createRequest(Request $request, $path)
{
- $newRequest = call_user_func(array(get_class($request), 'create'), $this->generateUri($request, $path), 'get', array(), $request->cookies->all(), array(), $request->server->all());
+ $newRequest = $request::create($this->generateUri($request, $path), 'get', array(), $request->cookies->all(), array(), $request->server->all());
if ($request->hasSession()) {
$newRequest->setSession($request->getSession());
}