@@ -309,7 +309,7 @@ def render(template_name, override_theme=None, **kwargs):
309def pre_request():
309def pre_request():
310 # merge GET, POST vars
310 # merge GET, POST vars
311 request.form = dict(request.form.items())
311 request.form = dict(request.form.items())
312− for k, v in request.args:
312+ for k, v in request.args.items():
313 if k not in request.form:
313 if k not in request.form:
314 request.form[k] = v
314 request.form[k] = v