From e8a9627f6619ca17e68da2d1558806f1965c8425 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Tue, 22 May 2018 18:29:11 +0200 Subject: [PATCH] Hardcode default skin/theme in error layout (fixes #373) This is a bit hackish. The best way would simply to somehow use Mastodon's ApplicationController with `use_pack 'error'` from the Rake task, but I'm not sure how to do that. --- app/views/layouts/error.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml index 9904b8fdd..be3e9f105 100644 --- a/app/views/layouts/error.html.haml +++ b/app/views/layouts/error.html.haml @@ -5,8 +5,8 @@ %meta{ charset: 'utf-8' }/ %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ') %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/ - = render partial: 'layouts/theme', object: @core - = render partial: 'layouts/theme', object: @theme + = render partial: 'layouts/theme', object: (@core || { pack: 'common' }) + = render partial: 'layouts/theme', object: (@theme || { pack: 'common', flavour: 'glitch', skin: 'default' }) %body.error .dialog %img{ alt: Setting.default_settings['site_title'], src: '/oops.gif' }/