Api: Fix merge action files in subdirectories had their path as part of action caption instead of just the file name

2021-10-21 09:51:05 -06:00 · 2021-10-21 09:51:05 -06:00 · 17d4c2a869
commit 17d4c2a869
parent 3c7d18b8db
1 changed files with 1 additions and 1 deletions
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@ -2607,7 +2607,7 @@ abstract class Merge
 			$action_base,
 			array(
 				'icon'       => Api\Vfs::mime_icon($file['mime']),
-				'caption'    => Api\Vfs::decodePath($file['name']),
+				'caption'    => Api\Vfs::decodePath(Api\Vfs::basename($file['name'])),
 				'onExecute'  => 'javaScript:app.' . $GLOBALS['egw_info']['flags']['currentapp'] . '.merge',
 				'merge_data' => $edit_attributes
 			),