ckeditor relative

helios-ag · Dec 29, 2014 · ea65d5e · ea65d5e
1 parent 4201d7e
commit ea65d5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Controller/ElFinderController.php b/Controller/ElFinderController.php
@@ -52,7 +52,8 @@ private function selectEditor($parameters, $instance, $formTypeId = null)
                     'locale'        => $locale,
                     'fullscreen'    => $fullscreen,
                     'includeAssets' => $includeAssets,
-                    'instance'      => $instance
+                    'instance'      => $instance,
+                    'relative_path' => $relativePath
                 );
                 return $result;
             case 'tinymce':

diff --git a/Resources/views/Elfinder/ckeditor.html.twig b/Resources/views/Elfinder/ckeditor.html.twig
@@ -26,7 +26,11 @@
             lang : '{{locale}}',
             getFileCallback : function(file) {
                 if (funcNum) {
-                    window.opener.CKEDITOR.tools.callFunction(funcNum, file.url);
+                    {% if relative_path %}
+                        window.opener.CKEDITOR.tools.callFunction(funcNum, file.path);
+                    {% else %}
+                        window.opener.CKEDITOR.tools.callFunction(funcNum, file.url);
+                    {% endif %}
                     window.close();
                 }
             }