From 0bde1c2e4d0872f1acaee4c94b4f7bd38ad354ea Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 08 Jan 2016 04:56:17 -0500
Subject: [PATCH] Fix missing language name in "Add to Dictionary" request in HTML mode (#1490634)

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

diff --git a/CHANGELOG b/CHANGELOG
index dadf1f9..53d900f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
 - Fix mail view scaling on iOS (#1490551)
 - Fix PHP7 warning "session_start(): Session callback expects true/false return value" (#1490624)
 - Fix XSS issue in SVG images handling (#1490625)
+- Fix missing language name in "Add to Dictionary" request in HTML mode (#1490634)
 
 RELEASE 1.2-beta
 ----------------
diff --git a/program/js/editor.js b/program/js/editor.js
index cd16158..200d8c8 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -71,6 +71,9 @@
     tinymce.registered_request_token = true;
     tinymce.util.XHR.on('beforeSend', function(e) {
       e.xhr.setRequestHeader('X-Roundcube-Request', rcmail.env.request_token);
+      // Fix missing lang parameter on addToDictionary request (#1490634)
+      if (e.settings && e.settings.data && /^method=addToDictionary/.test(e.settings.data) && !/&lang=/.test(e.settings.data))
+        e.settings.data += '&lang=' + ref.editor.plugins.spellchecker.getLanguage();
     });
   }
 

--
Gitblit v1.9.1