@@ -42,7 +42,7 @@ except:
43from datetime import datetime, timedelta
43from datetime import datetime, timedelta
44from urllib import urlencode
44from urllib import urlencode
45−from urlparse import urlparse
45+from urlparse import urlparse, urljoin
46from werkzeug.contrib.fixers import ProxyFix
46from werkzeug.contrib.fixers import ProxyFix
47from flask import (
47from flask import (
48 Flask, request, render_template, url_for, Response, make_response,
48 Flask, request, render_template, url_for, Response, make_response,
@@ -531,7 +531,7 @@ def preferences():
532 blocked_engines = []
532 blocked_engines = []
534− resp = make_response(redirect(url_for('index')))
534+ resp = make_response(redirect(urljoin(settings['server']['base_url'], url_for('index'))))
536 if request.method == 'GET':
536 if request.method == 'GET':
537 blocked_engines = get_blocked_engines(engines, request.cookies)
537 blocked_engines = get_blocked_engines(engines, request.cookies)
@@ -766,7 +766,7 @@ def favicon():
767@app.route('/clear_cookies')
767@app.route('/clear_cookies')
768def clear_cookies():
768def clear_cookies():
769− resp = make_response(redirect(url_for('index')))
769+ resp = make_response(redirect(urljoin(settings['server']['base_url'], url_for('index'))))
770 for cookie_name in request.cookies:
770 for cookie_name in request.cookies:
771 resp.delete_cookie(cookie_name)
771 resp.delete_cookie(cookie_name)
772 return resp
772 return resp