Merge lp:~osomon/webbrowser-app/escape-all-html-entities-in-search-queries into lp:webbrowser-app/staging

[Olivier Tilloy]

Escape all HTML entities in search queries.

=== modified file 'src/app/webbrowser/AddressBar.qml'
--- src/app/webbrowser/AddressBar.qml	2016-07-01 08:52:37 +0000
+++ src/app/webbrowser/AddressBar.qml	2017-01-03 16:22:24 +0000
@@ -301,7 +301,7 @@
         property var securityCertificateDetails: null
 
         function escapeHtmlEntities(query) {
-            return query.replace(/\W/, encodeURIComponent)
+            return query.replace(/\W/g, encodeURIComponent)
         }
 
         function buildSearchUrl(query) {

=== modified file 'tests/unittests/qml/tst_AddressBar.qml'
--- tests/unittests/qml/tst_AddressBar.qml	2015-11-17 17:16:37 +0000
+++ tests/unittests/qml/tst_AddressBar.qml	2017-01-03 16:22:24 +0000
@@ -163,6 +163,7 @@
                 {text: "\"kung fu\"", escaped: "%22kung+fu%22"},
                 {text: "surfin' usa", escaped: "surfin'+usa"},
                 {text: "to be or not to be?", escaped: "to+be+or+not+to+be%3F"},
+                {text: "c++ cout", escaped: "c%2B%2B+cout"},
             ]
         }