From: kibigo! <marrus-sh@users.noreply.github.com>
Date: Thu, 7 Dec 2017 22:49:54 +0000 (-0800)
Subject: Skins shouldn't apply to fallback flavours
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=717b7d555c39b71089ad01f86e8b26f09f8b61d2;p=mastodon.git

Skins shouldn't apply to fallback flavours
---

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