diff --git a/files/routes/errors.py b/files/routes/errors.py index 9e5e34da3..d1e54bded 100644 --- a/files/routes/errors.py +++ b/files/routes/errors.py @@ -36,7 +36,9 @@ def error(e): if request.headers.get("Authorization") or request.headers.get("xhr"): return {"error": title, "code": e.code, "description": msg, "details": details}, e.code img = ERROR_MARSEYS.get(e.code, 'marseyl') - return render_template('errors/error.html', err=True, title=title, msg=msg, details=details, img=img), e.code + if hasattr(g, "v"): v = g.v + else: v = None + return render_template('errors/error.html', title=title, msg=msg, details=details, img=img, v=v), e.code @app.errorhandler(401) def error_401(e): diff --git a/files/templates/default.html b/files/templates/default.html index 84ebda9ba..1516ea209 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -65,7 +65,7 @@ -{% if not err and v and v.spider %} +{% if v and v.spider %} {% endif %} diff --git a/files/templates/header.html b/files/templates/header.html index a26700515..4ac748679 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -13,7 +13,6 @@ } -{% if not err %}
{% if SITE_NAME == 'rDrama' %} {% if range(1,5) | random == 1 %} @@ -46,17 +45,8 @@ {{loggedin_counter+loggedout_counter}} people here now ({{loggedin_counter}} logged in) {% endif %}
-{% else %} - -{% endif %} -