treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix common packs when other pack also there

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
kibigo! 2017-12-06 15:34:19 -08:00
parent 161d286df2
commit 061211a1e3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -57,7 +57,7 @@ class ApplicationController < ActionController::Base
def pack(data, pack_name, skin = 'default') def pack(data, pack_name, skin = 'default')
return nil unless pack?(data, pack_name) return nil unless pack?(data, pack_name)
pack_data = { 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'], flavour: data['name'],
pack: pack_name, pack: pack_name,
preload: nil, preload: nil,