- Allow absolute URLs to images in HTML messages/sigs (#1485666)

- Fix message body which contains both inline attachments and emotions


git-svn-id: https://svn.roundcube.net/trunk@2232 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 0 deletions

diff --git a/roundcubemail/program/js/editor.js b/roundcubemail/program/js/editor.js
index a3f0d3492..624509085 100644
--- a/roundcubemail/program/js/editor.js
+++ b/roundcubemail/program/js/editor.js
@@ -28,6 +28,8 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
       theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor',
       theme_advanced_buttons2 : ',fontselect,fontsizeselect',
       theme_advanced_buttons3 : '',
+      relative_urls : false,
+      remove_script_host : false,
       gecko_spellcheck : true
     });
   else // mail compose
@@ -49,6 +51,8 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
       external_image_list_url : 'program/js/editor_images.js',
       spellchecker_languages : (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'),
       gecko_spellcheck : true,
+      relative_urls : false,
+      remove_script_host : false ,
       rc_client: rcube_webmail_client,
       oninit : 'rcmail_editor_callback'
     });