Merge branch 'virtuoso_integration' into stable

Victor Costa
2 parents 0c7bc489 170a723e
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
plugins/virtuoso/views/cms/virtuoso_plugin/_tinymce_template_editor.html.erb
@@ -6,6 +6,6 @@
   function tinymce_macros_setup(editor) {}
  
   jQuery(document).ready(function($) {
-    <%= tinymce_init_js(:valid_children => "+body[style]") %>
+    <%= tinymce_init_js(:valid_children => "+body[style]", :convert_urls => false) %>
   });
 </script>
...	...	@@ -6,6 +6,6 @@
6	6	function tinymce_macros_setup(editor) {}
7	7
8	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	11	</script>
...	...