diff options
author | feld <feld@feld.me> | 2023-12-09 14:08:13 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2023-12-09 14:08:13 +0000 |
commit | a67fc30d817e371face86ae6673d11d4854380c9 (patch) | |
tree | 2156bda1925e96eab6a040b335dee4280fabd50f | |
parent | 0e7531536847a2756ef30311a534ac1d5eead078 (diff) | |
parent | 0818a9136dc0ee353c9646ca9c3c96d979329dc4 (diff) | |
download | pleroma-a67fc30d817e371face86ae6673d11d4854380c9.tar.gz pleroma-a67fc30d817e371face86ae6673d11d4854380c9.zip |
Merge branch 'kphrx-develop-patch-87655' into 'develop'
Remove checking ImageMagick's commands for AnalyzeMetadata filter
See merge request pleroma/pleroma!3987
-rw-r--r-- | changelog.d/3987.fix | 1 | ||||
-rw-r--r-- | lib/pleroma/application_requirements.ex | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/changelog.d/3987.fix b/changelog.d/3987.fix new file mode 100644 index 000000000..5d578cc09 --- /dev/null +++ b/changelog.d/3987.fix @@ -0,0 +1 @@ +Remove checking ImageMagick's commands for Pleroma.Upload.Filter.AnalyzeMetadata diff --git a/lib/pleroma/application_requirements.ex b/lib/pleroma/application_requirements.ex index 44b1c1705..477eac35b 100644 --- a/lib/pleroma/application_requirements.ex +++ b/lib/pleroma/application_requirements.ex @@ -168,8 +168,6 @@ defmodule Pleroma.ApplicationRequirements do check_filter(Pleroma.Upload.Filter.Exiftool.ReadDescription, "exiftool"), check_filter(Pleroma.Upload.Filter.Mogrify, "mogrify"), check_filter(Pleroma.Upload.Filter.Mogrifun, "mogrify"), - check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "mogrify"), - check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "convert"), check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "ffprobe") ] |