Merge https://github.com/friendica/friendica into pull

[friendica.git] / view / profed_head.tpl

diff --git a/view/profed_head.tpl b/view/profed_head.tpl
index 2477654b39fcd79ba79b49feac69c0691565bdab..753e2fa5f39d7b220a85bd6bcf356460c6a8e155 100644 (file)
--- a/view/profed_head.tpl
+++ b/view/profed_head.tpl
@@ -1,3 +1,5 @@
+<script type="text/javascript" src="js/country.js" ></script>
+
 <script language="javascript" type="text/javascript"
           src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
@@ -18,9 +20,9 @@ tinyMCE.init({
        entity_encoding : "raw",
        add_unload_trigger : false,
        remove_linebreaks : false,
-       force_p_newlines : false,
-       force_br_newlines : true,
-       forced_root_block : '',
+       //force_p_newlines : false,
+       //force_br_newlines : true,
+       forced_root_block : 'div',
        content_css: "$baseurl/view/custom_tinymce.css",
        theme_advanced_path : false,
        setup : function(ed) {