From 6642408b61ca5439eef8ff63b48a8de78be54a05 Mon Sep 17 00:00:00 2001 From: Yuki Date: Wed, 26 Aug 2015 00:35:36 +0530 Subject: [PATCH] Fix show foreign themes bug --- app/views/layouts/application.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 161851fa..fdcb44db 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -12,7 +12,7 @@ %title= yield(:title) = javascript_include_tag 'i18n', 'data-turbolinks-track' => true = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true - - if @user.present? and @user.theme.present? and (user_signed_in? and current_user.show_foreign_themes?) + - if @user.present? and @user.theme.present? and (if user_signed_in? then current_user.show_foreign_themes? else true end) %link{rel: 'stylesheet', href: @user.theme.css.url, media: :all, 'data-turbolinks-track' => true} - elsif user_signed_in? and current_user.theme.present? %link{rel: 'stylesheet', href: current_user.theme.css.url, media: :all, 'data-turbolinks-track' => true}