about summary refs log tree commit diff
path: root/app/controllers/settings/flavours_controller.rb
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-09 20:16:31 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-10 12:10:43 -0600
commit395e64e8580e8232b817b6278ea28a7c523bd6f7 (patch)
treef099afd931c3c5f625c5fcf39d1d853cafcc9c56 /app/controllers/settings/flavours_controller.rb
parent514db316f798f3e9b65d1591ff88f7c82289ae38 (diff)
Thank you, Officer Murphy
Diffstat (limited to 'app/controllers/settings/flavours_controller.rb')
-rw-r--r--app/controllers/settings/flavours_controller.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/settings/flavours_controller.rb b/app/controllers/settings/flavours_controller.rb
index a2d2c9dee..634387715 100644
--- a/app/controllers/settings/flavours_controller.rb
+++ b/app/controllers/settings/flavours_controller.rb
@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
 class Settings::FlavoursController < Settings::BaseController
-
   def index
     redirect_to action: 'show', flavour: current_flavour
   end
 
   def show
-    unless Themes.instance.flavours.include?(params[:flavour]) or params[:flavour] == current_flavour
+    unless Themes.instance.flavours.include?(params[:flavour]) || (params[:flavour] == current_flavour)
       redirect_to action: 'show', flavour: current_flavour
     end
 
@@ -28,7 +27,6 @@ class Settings::FlavoursController < Settings::BaseController
 
   def user_settings_params
     { setting_flavour: params.require(:flavour),
-      setting_skin: params.dig(:user, :setting_skin)
-    }.with_indifferent_access
+      setting_skin: params.dig(:user, :setting_skin) }.with_indifferent_access
   end
 end