aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/meddleware/__init__.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-11-28 18:40:45 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-11-28 18:40:45 +0100
commit72567762e36c849ffe8172b6cea4ca1be682e511 (patch)
tree549d405d3a577cf46b840a5550caecc4e64b85a1 /mediagoblin/meddleware/__init__.py
parenta3663b407997cb8e2d45086641b7eb9f4efd476c (diff)
parentca9ebfe2e05c83248d647b442ff29a9758a6a05c (diff)
downloadmediagoblin-72567762e36c849ffe8172b6cea4ca1be682e511.tar.lz
mediagoblin-72567762e36c849ffe8172b6cea4ca1be682e511.tar.xz
mediagoblin-72567762e36c849ffe8172b6cea4ca1be682e511.zip
Merge remote branch 'remotes/nyergler/issue-680-csrf-optout'
* remotes/nyergler/issue-680-csrf-optout: Issue 680 Allow decorating views to prevent CSRF protection. Issue 680: Dispatch meddleware request processing post-routing
Diffstat (limited to 'mediagoblin/meddleware/__init__.py')
-rw-r--r--mediagoblin/meddleware/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/meddleware/__init__.py b/mediagoblin/meddleware/__init__.py
index 729a020d..7ba70d87 100644
--- a/mediagoblin/meddleware/__init__.py
+++ b/mediagoblin/meddleware/__init__.py
@@ -25,7 +25,7 @@ class BaseMeddleware(object):
def __init__(self, mg_app):
self.app = mg_app
- def process_request(self, request):
+ def process_request(self, request, controller):
pass
def process_response(self, request, response):