ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove extra spaces from search API queries and public account headers (fixes #7129) (#7152)

rebase/4.0.0rc2
ThibG 2018-04-16 17:19:04 +02:00 committed by Eugen Rochko
parent 1a37d7e252
commit 1c379b7ef4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/search_service.rb
View File

@ -4,7 +4,7 @@ class SearchService < BaseService
attr_accessor :query, :account, :limit, :resolve attr_accessor :query, :account, :limit, :resolve
def call(query, limit, resolve = false, account = nil) def call(query, limit, resolve = false, account = nil)
@query = query @query = query.strip
@account = account @account = account
@limit = limit @limit = limit
@resolve = resolve @resolve = resolve

4
app/views/accounts/_header.html.haml
View File

@ -6,8 +6,8 @@
.card__bio .card__bio
%h1.name %h1.name
%span.p-name.emojify= display_name(account) %span.p-name.emojify= display_name(account)
%small %small<
%span @#{account.local_username_and_domain} %span>< @#{account.local_username_and_domain}
= fa_icon('lock') if account.locked? = fa_icon('lock') if account.locked?
- if Setting.show_staff_badge - if Setting.show_staff_badge