Fixes #1357

stamparm · stamparm · commit 1f5e6606a720 · 2015-08-25T02:03:56.000+02:00
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -893,7 +893,12 @@ def _randomizeParameter(paramString, randomParameter):
             originals = {}
             keywords = keyword.kwlist
 
-            for item in filter(None, (get, post if not kb.postHint else None)):
+            if not get and PLACE.URI in conf.parameters:
+                query = urlparse.urlsplit(uri).query or ""
+            else:
+                query = None
+
+            for item in filter(None, (get, post if not kb.postHint else None, query)):
                 for part in item.split(delimiter):
                     if '=' in part:
                         name, value = part.split('=', 1)
@@ -956,6 +961,10 @@ def _randomizeParameter(paramString, randomParameter):
                             found = True
                             post = re.sub(regex, "\g<1>%s\g<3>" % value, post)
 
+                        if re.search(regex, (query or "")):
+                            found = True
+                            uri = re.sub(regex.replace(r"\A", r"\?"), "\g<1>%s\g<3>" % value, uri)
+
                         regex = r"((\A|%s)%s=).+?(%s|\Z)" % (re.escape(conf.cookieDel or DEFAULT_COOKIE_DELIMITER), name, re.escape(conf.cookieDel or DEFAULT_COOKIE_DELIMITER))
                         if re.search(regex, (cookie or "")):
                             found = True
