From a54d7d6f33904e925da27e74d34039f56b7b68e1 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Tue, 13 Aug 2013 15:22:07 -0500
Subject: fix a regression with the current_route_url changes in #1081

---
 pyramid/url.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyramid/url.py b/pyramid/url.py
index b135c361a..3d95d7cc9 100644
--- a/pyramid/url.py
+++ b/pyramid/url.py
@@ -224,8 +224,6 @@ class URLMethodsMixin(object):
             query = kw.pop('_query')
             if query:
                 qs = '?' + urlencode(query, doseq=True)
-        elif getattr(self, 'GET', None):
-            qs = '?' + urlencode(self.GET, doseq=True)
 
         if '_anchor' in kw:
             anchor = kw.pop('_anchor')
@@ -684,6 +682,9 @@ class URLMethodsMixin(object):
             if route_name is None:
                 raise ValueError('Current request matches no route')
 
+        if '_query' not in kw:
+            kw['_query'] = self.GET
+
         newkw = {}
         newkw.update(self.matchdict)
         newkw.update(kw)
-- 
cgit v1.2.3