diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-06-09 10:39:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-09 10:39:55 -0500 |
| commit | f9eb4ea80a0f5649cae02827ab4e1b44a2d91416 (patch) | |
| tree | c75c6adb4c18b6e032a5fbf6d6d63a7e4814ff30 | |
| parent | a9515f3186b49df63436b98d382ee6a6b755387d (diff) | |
| parent | e8a9627f6619ca17e68da2d1558806f1965c8425 (diff) | |
Merge pull request #506 from ThibG/glitch-soc/fixes/static-500
Hardcode default skin/theme in error layout (fixes #373)
| -rw-r--r-- | app/views/layouts/error.html.haml | 4 |
1 files 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' }/ |