always show a baseHref

trsteel88 · Feb 12, 2014 · 63e1c0f · 63e1c0f
1 parent 2e8d373
commit 63e1c0f
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/Resources/views/Form/ckeditor_widget.html.twig b/Resources/views/Form/ckeditor_widget.html.twig
@@ -82,9 +82,6 @@
             {% if format_tags|length > 0 %}
                 format_tags: '{{ format_tags | join(';') | raw }}',
             {% endif %}
-            {% if base_href is not null %}
-                baseHref: '{{ base_href }}',
-            {% endif %}
             {% if body_class is not null %}
                 bodyClass: '{{ body_class }}',
             {% endif %}
@@ -120,7 +117,8 @@
             {% if custom_config %}
                 customConfig: '{{ asset(custom_config) }}',
             {% endif %}
-            toolbar: {{ toolbar | json_encode | raw }}
+            toolbar: {{ toolbar | json_encode | raw }},
+            baseHref: '{{ base_href ? base_href : app.request.schemeAndHttpHost ~ app.request.baseUrl ~ '/' }}'
         };
 
         CKEDITOR.replace("{{ id }}", trsteelConfig);