Skip to content
This repository has been archived by the owner on Sep 16, 2021. It is now read-only.

Commit

Permalink
changing 647dc9f to work with the cleaned up routing bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
dbu committed Jun 11, 2012
1 parent 4e6026d commit 202c4f5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Controller/ContentController.php
Expand Up @@ -37,14 +37,14 @@ public function __construct(EngineInterface $templating, $defaultTemplate)
*
* @return Symfony\Component\HttpFoundation\Response
*/
public function indexAction($contentDocument, $path, $_template = null)
public function indexAction($contentDocument, $path, $contentTemplate = null)
{
if (!$contentDocument) {
throw new NotFoundHttpException('Content not found: ' . $path);
}

if ($_template === null) {
$_template = $this->defaultTemplate;
if ($contentTemplate === null) {
$contentTemplate = $this->defaultTemplate;
}

$params = array(
Expand All @@ -53,6 +53,6 @@ public function indexAction($contentDocument, $path, $_template = null)
'url' => $path,
);

return $this->templating->renderResponse($_template, $params);
return $this->templating->renderResponse($contentTemplate, $params);
}
}

0 comments on commit 202c4f5

Please sign in to comment.