editor consistency on profile edit page

diff --git a/boot.php b/boot.php
index c10b1ea6f412c33618b6a0fe6a966c570e670393..e28d00946645b26b5e7a170fad4bed06b96743c3 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.923' );
+define ( 'FRIENDIKA_VERSION',      '2.1.924' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
 define ( 'DB_UPDATE_VERSION',      1043   );
 

diff --git a/view/profed_head.tpl b/view/profed_head.tpl
index 7958c7ace71b8c70f5feb2ff0f1c4a5901b8ad74..1c1efdbe5e9b44314f66b2179bba098fde0d7f16 100644 (file)
--- a/view/profed_head.tpl
+++ b/view/profed_head.tpl
@@ -6,22 +6,27 @@
 tinyMCE.init({
        theme : "advanced",
        mode : "textareas",
-       plugins : "bbcode",
-       theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+       plugins : "bbcode,paste",
+       theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
        theme_advanced_buttons2 : "",
        theme_advanced_buttons3 : "",
        theme_advanced_toolbar_location : "top",
        theme_advanced_toolbar_align : "center",
-       theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle",
-       content_css : "bbcode.css",
+       theme_advanced_blockformats : "blockquote,code",
+       paste_text_sticky : true,
        entity_encoding : "raw",
        add_unload_trigger : false,
        remove_linebreaks : false,
        force_p_newlines : false,
        force_br_newlines : true,
        forced_root_block : '',
-       content_css: "$baseurl/view/custom_tinymce.css"
-
+       content_css: "$baseurl/view/custom_tinymce.css",
+       theme_advanced_path : false,
+       setup : function(ed) {
+               ed.onInit.add(function(ed) {
+            ed.pasteAsPlainText = true;
+        });
+    }
 
 });