Commit a58f6544edd9b173e4338954c921c73af58bfbbe

Authored by Victor Costa
2 parents 0c7bc489 170a723e

Merge branch 'virtuoso_integration' into stable

plugins/virtuoso/views/cms/virtuoso_plugin/_tinymce_template_editor.html.erb
@@ -6,6 +6,6 @@ @@ -6,6 +6,6 @@
6 function tinymce_macros_setup(editor) {} 6 function tinymce_macros_setup(editor) {}
7 7
8 jQuery(document).ready(function($) { 8 jQuery(document).ready(function($) {
9 - <%= tinymce_init_js(:valid_children => "+body[style]") %> 9 + <%= tinymce_init_js(:valid_children => "+body[style]", :convert_urls => false) %>
10 }); 10 });
11 </script> 11 </script>