added formTypeId argument to selectEditor method.

helios-ag · Oct 24, 2014 · ba0825f · ba0825f
1 parent 45f7812
commit ba0825f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Controller/ElFinderController.php b/Controller/ElFinderController.php
@@ -23,7 +23,7 @@ public function showAction($instance)
     {
         $efParameters = $this->container->getParameter('fm_elfinder');
         $parameters = $efParameters['instances'][$instance];
-        $result = $this->selectEditor($parameters, $instance);
+        $result = $this->selectEditor($parameters, $instance, $this->request->get("id"));
 
         return $this->render($result['template'], $result['params']);
     }
@@ -33,7 +33,7 @@ public function showAction($instance)
      * @param $instance
      * @return array
      */
-    private function selectEditor($parameters, $instance)
+    private function selectEditor($parameters, $instance, $formTypeId = null)
     {
         $editor = $parameters['editor'];
         $locale = $parameters['locale'] ?: $this->container->getParameter('locale');
@@ -77,7 +77,7 @@ private function selectEditor($parameters, $instance)
                     'fullscreen' => $fullscreen,
                     'includeAssets' => $includeAssets,
                     'instance' => $instance,
-                    'id'=>$this->getRequest()->get("id")
+                    'id'=>$formTypeId
                 );
                 return $result;
             default: