Permalink
Browse files

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
  • Loading branch information...
2 parents 13ee95f + 7993ef0 commit 18efc4bfd228dda0e839854836dbd4c22db090f1 @fabpot fabpot committed Mar 15, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 HttpCache/Store.php
View
2 HttpCache/Store.php
@@ -250,7 +250,7 @@ public function invalidate(Request $request)
// As per the RFC, invalidate Location and Content-Location URLs if present
foreach (array('Location', 'Content-Location') as $header) {
if ($uri = $request->headers->get($header)) {
- $subRequest = call_user_func(array(get_class($request), 'create'), 'get', array(), array(), array(), $request->server->all());
+ $subRequest = $request::create($uri, 'get', array(), array(), array(), $request->server->all());
$this->invalidate($subRequest);
}

0 comments on commit 18efc4b

Please sign in to comment.