diff options
| author | Tristan Mahé <gled@remote-shell.net> | 2018-06-26 13:49:57 -0700 |
|---|---|---|
| committer | Tristan Mahé <gled@remote-shell.net> | 2018-06-26 13:49:57 -0700 |
| commit | c67cf8e9af3ab9b52f34387a686a68ee4e1554b4 (patch) | |
| tree | 743008469dead8ed3922e494f29c6ae4191a3b49 | |
| parent | cb21bf5fc225899ad6cf87f5ab0253506cf0531e (diff) | |
| download | pleroma-c67cf8e9af3ab9b52f34387a686a68ee4e1554b4.tar.gz | |
format...
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | lib/pleroma/upload.ex | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index fd9662aea..33b7f098e 100644 --- a/config/config.exs +++ b/config/config.exs @@ -10,7 +10,7 @@ config :pleroma, ecto_repos: [Pleroma.Repo] config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes -config :pleroma, Pleroma.Upload, +config :pleroma, Pleroma.Upload, uploads: "uploads", strip_exif: false diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index dee281f5b..e412e43fa 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -83,8 +83,9 @@ defmodule Pleroma.Upload do def strip_exif_data(file) do settings = Application.get_env(:pleroma, Pleroma.Upload) @do_strip = Keyword.fetch!(settings, :strip_exif) + if @do_strip == true do - Mogrify.open(file) |> Mogrify.custom("strip") |> Mogrify.save(in_place: true) + Mogrify.open(file) |> Mogrify.custom("strip") |> Mogrify.save(in_place: true) end end |