projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix aliases sorting
[akkoma]
/
lib
/
pleroma
/
upload.ex
diff --git
a/lib/pleroma/upload.ex
b/lib/pleroma/upload.ex
index 5570ed104b106a10bdf219214fdb9d05a30d3a46..17822dc5eb65959e5ad753f9550d0a119de058d8 100644
(file)
--- a/
lib/pleroma/upload.ex
+++ b/
lib/pleroma/upload.ex
@@
-235,7
+235,7
@@
defmodule Pleroma.Upload do
case uploader do
Pleroma.Uploaders.Local ->
case uploader do
Pleroma.Uploaders.Local ->
- upload_base_url || Pleroma.Web.
base_
url() <> "/media/"
+ upload_base_url || Pleroma.Web.
Endpoint.
url() <> "/media/"
Pleroma.Uploaders.S3 ->
bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
Pleroma.Uploaders.S3 ->
bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
@@
-261,7
+261,7
@@
defmodule Pleroma.Upload do
end
_ ->
end
_ ->
- public_endpoint || upload_base_url || Pleroma.Web.
base_
url() <> "/media/"
+ public_endpoint || upload_base_url || Pleroma.Web.
Endpoint.
url() <> "/media/"
end
end
end
end
end
end