diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-31 15:09:11 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-31 16:48:03 -0500 |
| commit | 51a9f97e87823cbd9e92c375f4bc4c0bfa8b79db (patch) | |
| tree | 5bdc8da18a07d4dfe7e6f05c435d078f45e4d0b7 /lib/pleroma/upload.ex | |
| parent | 2e682788a30b225b67254e92d1807b317ede57f8 (diff) | |
| download | pleroma-51a9f97e87823cbd9e92c375f4bc4c0bfa8b79db.tar.gz | |
Deprecate Pleroma.Web.base_url/0
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
Diffstat (limited to 'lib/pleroma/upload.ex')
| -rw-r--r-- | lib/pleroma/upload.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index 654711351..b32131bb6 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -225,7 +225,7 @@ defmodule Pleroma.Upload do 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]) @@ -251,7 +251,7 @@ defmodule Pleroma.Upload do end _ -> - public_endpoint || upload_base_url || Pleroma.Web.base_url() <> "/media/" + public_endpoint || upload_base_url || Pleroma.Web.Endpoint.url() <> "/media/" end end end |