From fe420a4e9e176a1561ecb1d123e83206d72763c7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 11 Sep 2018 09:24:24 +0200
Subject: [PATCH] Update to TinyMCE 4.8.2

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

diff --git a/CHANGELOG b/CHANGELOG
index 0106f40d6..77888aa91 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Update to TinyMCE 4.8.2
 - Plugin API: Added 'raise_error' hook (#6199)
 - Managesieve: Added support for 'editheader' extension - RFC5293 (#5954)
 - Password: Added 'modoboa' driver (#6361)
diff --git a/jsdeps.json b/jsdeps.json
index e08fc4d05..c7e11cd2b 100644
--- a/jsdeps.json
+++ b/jsdeps.json
@@ -36,10 +36,10 @@
     },
     {
       "lib": "tinymce",
-      "version": "4.7.13",
+      "version": "4.8.2",
       "url": "http://download.ephox.com/tinymce/community/tinymce_$v.zip",
       "dest": "program/js",
-      "sha1": "7f988f3899aebee6d49bd55e981331da07eee6c5",
+      "sha1": "d7fced05acdeeb78299585ea9909b0de2b3d759d",
       "license": "LGPL",
       "copyright": "Copyright (c) 1999-2015 Ephox Corp. All rights reserved",
       "rm": "program/js/tinymce",
@@ -56,7 +56,7 @@
     },
     {
       "lib": "tinymce-langs",
-      "version": "4.7.13",
+      "version": "4.8.2",
       "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&extension=.zip",
       "dest": "program/js/tinymce"
     },
diff --git a/program/js/editor.js b/program/js/editor.js
index 09b3de1d5..9ee78d628 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=4071300',
+      cache_suffix: 's=4080200',
       theme: 'modern',
       language: config.lang,
       content_css: rcmail.assets_path('program/resources/tinymce/content.css'),