merged branch jfsimon/issue-7185-2.2 (PR #7390)

fabpot · fabpot · commit d9181ba5b0ad · 2013-03-18T14:37:15.000+01:00
This PR was merged into the 2.2 branch. Commits ------- 53cf12b replaced new occurences of 'Request::create()' with '::create()' Discussion ---------- [2.2] sub-requests are now created with the same class as their parent Following #7381 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #7185, #7186
diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
@@ -89,7 +89,7 @@ protected function createSubRequest($uri, Request $request)
         // the sub-request is internal
         $server['REMOTE_ADDR'] = '127.0.0.1';
 
-        $subRequest = Request::create($uri, 'get', array(), $cookies, array(), $server);
+        $subRequest = $request::create($uri, 'get', array(), $cookies, array(), $server);
         if ($session = $request->getSession()) {
             $subRequest->setSession($session);
         }

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected function createSubRequest($uri, Request $request)`
`89`	`89`	`// the sub-request is internal`
`90`	`90`	`$server['REMOTE_ADDR'] = '127.0.0.1';`
`91`	`91`
`92`		`- $subRequest = Request::create($uri, 'get', array(), $cookies, array(), $server);`
	`92`	`+ $subRequest = $request::create($uri, 'get', array(), $cookies, array(), $server);`
`93`	`93`	`if ($session = $request->getSession()) {`
`94`	`94`	`$subRequest->setSession($session);`
`95`	`95`	`}`