FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix get_active_theme to return proper theme for user

This commit is contained in:
Andreas Nedbal 2020-05-05 20:17:49 +02:00
parent b7b2adde44
commit d9f67e86d9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/theme_helper.rb
View File

@ -47,14 +47,18 @@ module ThemeHelper
end
def get_active_theme
if current_user&.theme
current_user.theme
elsif @user&.theme
if @user&.theme
if user_signed_in?
@user.theme unless !current_user&.show_foreign_themes?
if current_user&.show_foreign_themes?
@user.theme
else
current_user&.theme
end
else
@user.theme
end
elsif current_user&.theme
current_user.theme
end
end