From 8ba12b0a8d2c1921a63154232c02f8cdebc75aca Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 12 Oct 2017 11:03:48 +0200
Subject: [PATCH] Fix Edge encoding bug when pasting text into the HTML editor,
 update to TinyMCE 4.5.8 (#5885)

---
 CHANGELOG            | 1 +
 jsdeps.json          | 8 ++++----
 program/js/editor.js | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5ab2b0ccd69..8d3b5d17430 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail
 - Fix bug where assets_path wasn't added to some watermark frames
 - Fix so untagged COPYUID responses are also supported according to RFC6851 (#5982)
 - Fix issue caused by non-default session.cookie_lifetime setting (#5961)
+- Fix Edge encoding bug when pasting text into the HTML editor, update to TinyMCE 4.5.8 (#5885)
 
 RELEASE 1.3.1
 -------------
diff --git a/jsdeps.json b/jsdeps.json
index d0acecbd4f1..12a6fe7cc6b 100644
--- a/jsdeps.json
+++ b/jsdeps.json
@@ -35,10 +35,10 @@
     },
     {
       "lib": "tinymce",
-      "version": "4.5.7",
-      "url": "http://download.ephox.com/tinymce/community/tinymce_4.5.7.zip",
+      "version": "4.5.8",
+      "url": "http://download.ephox.com/tinymce/community/tinymce_4.5.8.zip",
       "dest": "program/js",
-      "sha1": "4e86907c4748f7f75072e173ff3eee08700b9594",
+      "sha1": "08b0757264adb86066940bbafb7aa9ec0c7c6685",
       "license": "LGPL",
       "copyright": "Copyright (c) 1999-2015 Ephox Corp. All rights reserved",
       "rm": "program/js/tinymce",
@@ -55,7 +55,7 @@
     },
     {
       "lib": "tinymce-langs",
-      "version": "4.5.7",
+      "version": "4.5.8",
       "url": "https://tinymce-services.azurewebsites.net/1/i18n/download?langs=ar,hy,az,eu,be,bs,bg_BG,ca,zh_CN,zh_TW,hr,cs,cs_CZ,da,nl,en_CA,en_GB,eo,et,fo,fi,fr_FR,fr_CH,gd,gl,ka_GE,de,de_AT,el,he_IL,hi_IN,hu_HU,is_IS,id,ga,it,ja,kab,km_KH,ko_KR,ku,ku_IQ,lv,lt,lb,mk_MK,ml_IN,nb_NO,oc,fa,fa_IR,pl,pt_BR,pt_PT,ro,ru,sk,sl_SI,es,es_MX,sv_SE,tg,ta,ta_IN,tt,th_TH,tr,tr_TR,ug,uk,uk_UA,vi,vi_VN,cy",
       "dest": "program/js/tinymce"
     },
diff --git a/program/js/editor.js b/program/js/editor.js
index 7bb0538170f..ae7f71c91b7 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -39,7 +39,7 @@ function rcube_text_editor(config, id)
     abs_url = location.href.replace(/[?#].*$/, '').replace(/\/$/, ''),
     conf = {
       selector: '#' + ($('#' + id).is('.mce_editor') ? id : 'fake-editor-id'),
-      cache_suffix: 's=4050700',
+      cache_suffix: 's=4050800',
       theme: 'modern',
       language: config.lang,
       content_css: rcmail.assets_path('program/resources/tinymce/content.css'),