Ticket #2303: fix_r6566_t2303.diff

tg/controllers.py

@@ -129 +129 @@
         rendering.
         """
 
+        # Add the GET/POST request params to our params dict, overriding any defaults passed in.
+        params.update(pylons.request.params.mixed())
+
         self._initialize_validation_context()
         pylons.request.start_response = self.start_response
 
@@ -204 +207 @@
         be FormEncode Invalid objects.
         """
 
-        # this is here because the params were not getting passed in on controllers that
-        # were mapped with routes.  This is a fix, but it's in the wrong place.
-        # we need to add better tests to ensure decorated controllers with routings work
-        # properly.
-
         validation = getattr(controller.decoration, 'validation', None)
 
         if validation is None:
@@ -468 +466 @@
             pylons.c.controller_url = url
         if remainder and remainder[-1] == '':
             remainder.pop()
-        return controller, remainder, pylons.request.params.mixed()
+        return controller, remainder, {}
 
     def _perform_call(self, func, args):
         controller, remainder, params = self._get_routing_info(args.get('url'))