diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-05 22:34:47 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-05 22:34:47 +0000 |
| commit | 8d047c7a72c961f84518b879b6bd92e7a40dabb2 (patch) | |
| tree | f670b426e285b446c6ed1da6e7e51a6f0982c868 /lib | |
| parent | 0b54c3d6432dea77542596e34057f8d3fc69ca4c (diff) | |
| parent | a81307251c7dde298013003373e9cd28ebd9dede (diff) | |
| download | pleroma-8d047c7a72c961f84518b879b6bd92e7a40dabb2.tar.gz | |
Merge branch 'fix/user-search-null-name' into 'develop'
fix user search results for users with unset display name
Closes #499
See merge request pleroma/pleroma!625
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 1edded415..0e5e2d943 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -610,7 +610,7 @@ defmodule Pleroma.User do select_merge: %{ search_distance: fragment( - "? <-> (? || ?)", + "? <-> (? || coalesce(?, ''))", ^query, u.nickname, u.name |