about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorkibigo! <marrus-sh@users.noreply.github.com>2017-12-07 14:49:54 -0800
committerkibigo! <marrus-sh@users.noreply.github.com>2017-12-07 14:49:54 -0800
commit717b7d555c39b71089ad01f86e8b26f09f8b61d2 (patch)
treee5f5e063124b7a9c22c4af91deba677e5aa181cb /app/controllers
parent753535c3c7eac49d9b4d238912fa856e6fb0748c (diff)
Skins shouldn't apply to fallback flavours
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d1fc43399..c6d148c8c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -103,15 +103,15 @@ class ApplicationController < ActionController::Base
         if data['fallback'].nil?
           return nil_pack(data, pack_name, skin)
         elsif data['fallback'].is_a?(String) && Themes.instance.flavour(data['fallback'])
-          return resolve_pack(Themes.instance.flavour(data['fallback']), pack_name, skin)
+          return resolve_pack(Themes.instance.flavour(data['fallback']), pack_name)
         elsif data['fallback'].is_a?(Array)
           data['fallback'].each do |fallback|
-            return resolve_pack(Themes.instance.flavour(fallback), pack_name, skin) if Themes.instance.flavour(fallback)
+            return resolve_pack(Themes.instance.flavour(fallback), pack_name) if Themes.instance.flavour(fallback)
           end
         end
         return nil_pack(data, pack_name, skin)
       end
-      return data.key?('name') && data['name'] != Setting.default_settings['flavour'] ? resolve_pack(Themes.instance.flavour(Setting.default_settings['flavour']), pack_name, skin) : nil_pack(data, pack_name, skin)
+      return data.key?('name') && data['name'] != Setting.default_settings['flavour'] ? resolve_pack(Themes.instance.flavour(Setting.default_settings['flavour']), pack_name) : nil_pack(data, pack_name, skin)
     end
     result
   end