[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:23:38 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=32aeeda

The following commit has been merged in the master branch:
commit 32aeeda2e54e3a9a1eb5b46da6b0f581513df3c1
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Mar 24 01:09:50 2013 +0000

    Move \ escaping into AdiumThemeView where it belongs
    
    BUG: 316267
    REVIEW: 109685
---
 lib/adium-theme-view.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 9d1888f..361cd6d 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -520,8 +520,10 @@ AdiumThemeView::AppendMode AdiumThemeView::appendMode(const AdiumThemeMessageInf
 
 void AdiumThemeView::appendMessage(QString &html, const QString &script, AppendMode mode)
 {
-    QString js = appendScript(mode).arg(html.replace(QLatin1Char('\"'), QLatin1String("\\""))
-                                            .replace(QLatin1Char('
'), QLatin1String("")));
+    QString js = appendScript(mode).arg(html.replace(QLatin1Char('\'), QLatin1String("\\")) /* replace single \ with \   */
+                                            .replace(QLatin1Char('\"'), QLatin1String("\\"")) /* replace " with \"   */
+                                            .replace(QLatin1Char('
'), QLatin1String(""))); /* remove new lines    */
+
     page()->mainFrame()->evaluateJavaScript(js);
 
     if (!script.isEmpty()) {

-- 
ktp-text-ui packaging



More information about the pkg-kde-commits mailing list