projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1304-user-info-deprecation' into 'develop'
[akkoma]
/
lib
/
pleroma
/
uploaders
/
local.ex
diff --git
a/lib/pleroma/uploaders/local.ex
b/lib/pleroma/uploaders/local.ex
index fc533da23cd2fa0194d96c7185a3014869da7be1..36b3c35ecdbbb48b4df021d3bdb7ce1d0d72a27e 100644
(file)
--- a/
lib/pleroma/uploaders/local.ex
+++ b/
lib/pleroma/uploaders/local.ex
@@
-11,7
+11,7
@@
defmodule Pleroma.Uploaders.Local do
def put_file(upload) do
{local_path, file} =
def put_file(upload) do
{local_path, file} =
- case Enum.reverse(
String.split(upload.path, "/", trim: true
)) do
+ case Enum.reverse(
Path.split(upload.path
)) do
[file] ->
{upload_path(), file}
[file] ->
{upload_path(), file}
@@
-23,7
+23,7
@@
defmodule Pleroma.Uploaders.Local do
result_file = Path.join(local_path, file)
result_file = Path.join(local_path, file)
-
unless
File.exists?(result_file) do
+
if not
File.exists?(result_file) do
File.cp!(upload.tempfile, result_file)
end
File.cp!(upload.tempfile, result_file)
end