IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 18:30:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: if badge has an image do not override icon

Browse Source
This commit is contained in:
Sam 2016-10-21 10:53:58 +11:00
parent d13cd3471f
commit 35d248ab0d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/badge.rb
View File

@ -129,8 +129,10 @@ class Badge < ActiveRecord::Base
end
def default_icon=(val)
self.icon ||= val
self.icon = val if self.icon = "fa-certificate"
unless self.image
self.icon ||= val
self.icon = val if self.icon = "fa-certificate"
end
end
def default_name=(val)