projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/mediaproxy-empty-url' into 'develop'
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index be634a8e119db7ce5457834a7c6ef232e7b7fd84..6e1d5559d359f6aab26e08731747a36a5d007ac9 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-498,7
+498,7
@@
defmodule Pleroma.User do
Repo.all(query)
end
- def search(query, resolve) do
+ def search(query, resolve
\\ false
) do
# strip the beginning @ off if there is a query
query = String.trim_leading(query, "@")