Merge pull request #105 from symfony-cmf/fix_non_root_bugs

[WIP] Fixed bugs when Symfony is not in the root
symfony-cmf · May 5, 2014 · 3c49bc0 · 3c49bc0
2 parents cdd9c03 + be0be16
commit 3c49bc0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -47,7 +47,7 @@ public function getConfigTreeBuilder()
                 ->end()
                 ->scalarNode('stanbol_url')->defaultValue('http://dev.iks-project.eu:8081')->end()
                 ->booleanNode('fixed_toolbar')->defaultTrue()->end()
-                ->scalarNode('editor_base_path')->defaultValue('/bundles/cmfcreate/vendor/ckeditor/')->end()
+                ->scalarNode('editor_base_path')->defaultValue('bundles/cmfcreate/vendor/ckeditor/')->end()
                 ->arrayNode('plain_text_types')
                     ->useAttributeAsKey('name')
                     ->prototype('scalar')->end()

diff --git a/Resources/views/includejsfiles-ckeditor.html.twig b/Resources/views/includejsfiles-ckeditor.html.twig
@@ -1,6 +1,6 @@
 {% include "CmfCreateBundle::includejsfiles-create.html.twig" %}
 
-<script>window.CKEDITOR_BASEPATH = '{{ cmfCreateEditorBasePath }}';</script>
+<script>window.CKEDITOR_BASEPATH = '{{ asset(cmfCreateEditorBasePath) }}';</script>
 {% javascripts output="/js/ckeditor.js"
     '@CmfCreateBundle/Resources/public/vendor/ckeditor/ckeditor.js'
     '@CmfCreateBundle/Resources/public/js/init-create-ckeditor.js'