]> cat aescling's git repositories - mastodon.git/commitdiff
Fix common packs when other pack also there
authorkibigo! <marrus-sh@users.noreply.github.com>
Wed, 6 Dec 2017 23:34:19 +0000 (15:34 -0800)
committerkibigo! <marrus-sh@users.noreply.github.com>
Wed, 6 Dec 2017 23:34:19 +0000 (15:34 -0800)
app/controllers/application_controller.rb

index d116c4767eb50e81f4e7529c3b3f7a878f26e242..d1fc4339901a64bcd75d47a581d63e8e930620e7 100644 (file)
@@ -57,7 +57,7 @@ class ApplicationController < ActionController::Base
   def pack(data, pack_name, skin = 'default')
     return nil unless pack?(data, pack_name)
     pack_data = {
-      common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.flavour(current_flavour) : Themes.instance.core, 'common'),
+      common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.flavour(current_flavour) : Themes.instance.core, 'common', skin),
       flavour: data['name'],
       pack: pack_name,
       preload: nil,