From 6ad98e7b1b35ddad806ba59bd5fb53368e0ee784 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 14 Dec 2023 12:29:44 +0100
Subject: [PATCH] Fix TinyMCE localization installation (#9266)

---
 CHANGELOG.md          | 1 +
 bin/install-jsdeps.sh | 2 +-
 jsdeps.json           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11cbb5fdf..194612307 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - Fix PHP8 warnings (#9235, #9238, #9242)
 - Fix saving other encryption settings besides enigma's (#9240)
 - Fix unneeded php command use in installto.sh and deluser.sh scripts (#9237)
+- Fix TinyMCE localization installation (#9266)
 
 ## Release 1.6.5
 
diff --git a/bin/install-jsdeps.sh b/bin/install-jsdeps.sh
index 59227df43..0dff07336 100755
--- a/bin/install-jsdeps.sh
+++ b/bin/install-jsdeps.sh
@@ -158,7 +158,7 @@ function extract_filetype($package, &$filetype = null)
 {
     global $CACHEDIR;
 
-    $filetype   = pathinfo($package['url'], PATHINFO_EXTENSION) ?: 'tmp';
+    $filetype   = pathinfo(preg_replace('/[?&].*$/', '', $package['url']), PATHINFO_EXTENSION) ?: 'tmp';
     $cache_file = $CACHEDIR . '/' . $package['lib'] . '-' . $package['version'] . '.' . $filetype;
 
     // Make sure it is a zip file
diff --git a/jsdeps.json b/jsdeps.json
index 0a775bfdc..c40d91fe5 100644
--- a/jsdeps.json
+++ b/jsdeps.json
@@ -45,7 +45,7 @@
     {
       "lib": "tinymce-langs",
       "version": "5.10.9",
-      "url": "https://www.tiny.cloud/tinymce-services-azure/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&v=$v&extension=.zip",
+      "url": "https://download.tiny.cloud/tinymce/community/languagepacks/5/langs.zip?v=$v",
       "dest": "program/js/tinymce"
     },
     {