Skip to content

Commit

Permalink
injected Request object directly into action
Browse files Browse the repository at this point in the history
  • Loading branch information
zeno-ce committed Oct 24, 2014
1 parent ba0825f commit fdbc956
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Controller/ElFinderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request;

/**
* Loader service for Elfinder backend
Expand All @@ -19,11 +20,11 @@ class ElFinderController extends Controller
* @param string $instance
* @return Response
*/
public function showAction($instance)
public function showAction(Request $request, $instance)
{
$efParameters = $this->container->getParameter('fm_elfinder');
$parameters = $efParameters['instances'][$instance];
$result = $this->selectEditor($parameters, $instance, $this->request->get("id"));
$result = $this->selectEditor($parameters, $instance, $request->get("id"));

return $this->render($result['template'], $result['params']);
}
Expand Down

0 comments on commit fdbc956

Please sign in to comment.