From 2a3bde1450b9b25c427c414723e2699e1777e12f Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 4 Oct 2016 16:46:50 +0200 Subject: [PATCH] fix dbb0796 allow to specify a subdirectory in attach_file as part of $file[name] parameter (subdir was created, but file was copied to main dir) --- api/src/Link.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/Link.php b/api/src/Link.php index 708fc8477b..e7704af71c 100644 --- a/api/src/Link.php +++ b/api/src/Link.php @@ -1190,7 +1190,7 @@ class Link extends Link\Storage } if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir,0,true))) { - $Ok = Vfs::copy_uploaded($file, $p=self::vfs_path($app,$id,'',true), $comment, false); // no is_uploaded_file() check! + $Ok = Vfs::copy_uploaded($file, $p=Vfs::parse_url($entry_dir, PHP_URL_PATH), $comment, false); // no is_uploaded_file() check! if (!$Ok) error_log(__METHOD__."('$app', '$id', ".array2string($file).", '$comment') called Vfs::copy_uploaded('$file[tmp_name]', '$p', '$comment', false)=".array2string($Ok)); } else