@@ -307,6 +307,11 @@ def render(template_name, override_theme=None, **kwargs):
308@app.before_request
308@app.before_request
309def pre_request():
309def pre_request():
310+ # merge GET, POST vars
311+ request.form = dict(request.form.items())
312+ for k, v in request.args:
313+ if k not in request.form:
311 request.user_plugins = []
316 request.user_plugins = []
312 allowed_plugins = request.cookies.get('allowed_plugins', '').split(',')
317 allowed_plugins = request.cookies.get('allowed_plugins', '').split(',')
@@ -507,7 +512,6 @@ def preferences():
507 autocomplete = ''
512 autocomplete = ''
508 method = 'POST'
513 method = 'POST'
509 safesearch = '1'
514 safesearch = '1'
511 for pd_name, pd in request.form.items():
515 for pd_name, pd in request.form.items():
512 if pd_name.startswith('category_'):
516 if pd_name.startswith('category_'):
513 category = pd_name[9:]
517 category = pd_name[9:]