aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/upload.ex
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-03-30 14:32:36 +0200
committerRoger Braun <roger@rogerbraun.net>2017-03-30 14:32:36 +0200
commitd18473f0c3ba151d9640a08192370fee2e9af105 (patch)
treebf7a17ede06242a7acb64b0acb78ba722d2d35f2 /lib/pleroma/upload.ex
parente7dc39e40cde5599f2e1e0dd1715670fd1e76720 (diff)
downloadpleroma-d18473f0c3ba151d9640a08192370fee2e9af105.tar.gz
Add port if specified.
Diffstat (limited to 'lib/pleroma/upload.ex')
-rw-r--r--lib/pleroma/upload.ex9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index fdda2634e..158656e92 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -20,13 +20,6 @@ defmodule Pleroma.Upload do
end
defp url_for(file) do
- host =
- Application.get_env(:pleroma, Pleroma.Web.Endpoint)
- |> Keyword.fetch!(:url)
- |> Keyword.fetch!(:host)
-
- protocol = Application.get_env(:pleroma, Pleroma.Web.Endpoint) |> Keyword.fetch!(:protocol)
-
- "#{protocol}://#{host}/media/#{file}"
+ "#{Pleroma.Web.base_url()}/media/#{file}"
end
end