forked from treehouse/mastodon
Fix featured tags not finding the right tag on save (#11504)
Regression from f371b32
rebase/4.0.0rc2
parent
dd38c280a5
commit
a8958d07e2
|
@ -324,7 +324,8 @@
|
|||
&.active h4 {
|
||||
&,
|
||||
.fa,
|
||||
small {
|
||||
small,
|
||||
.trends__item__current {
|
||||
color: $primary-text-color;
|
||||
}
|
||||
}
|
||||
|
@ -337,6 +338,10 @@
|
|||
&.active .avatar-stack .account__avatar {
|
||||
border-color: $ui-highlight-color;
|
||||
}
|
||||
|
||||
.trends__item__current {
|
||||
padding-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ class FeaturedTag < ApplicationRecord
|
|||
validate :validate_featured_tags_limit, on: :create
|
||||
|
||||
def name=(str)
|
||||
self.tag = Tag.find_or_initialize_by(name: str.strip.delete('#').mb_chars.downcase.to_s)
|
||||
self.tag = Tag.find_or_create_by_names(str.strip)&.first
|
||||
end
|
||||
|
||||
def increment(timestamp)
|
||||
|
|
Loading…
Reference in New Issue