diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-12-06 15:34:19 -0800 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-12-06 15:34:19 -0800 |
| commit | 061211a1e3bd4cb6af45fda47cd8be2f53ebfbac (patch) | |
| tree | 3757b6e2e83d08dc1b50b3eef4187c292817a646 /app | |
| parent | 161d286df2412dc5fcbbf8dc6e66b3ae4e820dd6 (diff) | |
Fix common packs when other pack also there
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d116c4767..d1fc43399 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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, |