Correctly URL encode return URLS for saved search

diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index ea9a4737cd5bbc3869b7319ccf6a107bf04554e8..549025dec00b4b26c9d6865a5cd133517b206a1d 100644 (file)
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -912,7 +912,7 @@ class HTML
                        '$save_label'   => $save_label,
                        '$search_hint'  => L10n::t('@name, !forum, #tags, content'),
                        '$mode'         => $mode,
-                       '$return_url'   => urlencode('search?q=' . $s),
+                       '$return_url'   => urlencode('search?q=' . urlencode($s)),
                ];
 
                if (!$aside) {

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 9c0d9e1dfff9cebd5373cc3c2770a21eae729962..73de090a71acb429e32100ff67d66e607e116074 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -63,7 +63,7 @@ class Index extends BaseSearchModule
                }
 
                if (local_user()) {
-                       self::getApp()->page['aside'] .= Widget\SavedSearches::getHTML('search?q=' . $search, $search);
+                       self::getApp()->page['aside'] .= Widget\SavedSearches::getHTML('search?q=' . urlencode($search), $search);
                }
 
                Nav::setSelected('search');