holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix Scrutinizer "bugs"

Browse Source
This commit is contained in:
Ralf Becker 2016-07-02 12:28:58 +02:00
parent 01659d13c9
commit 1b60ef19f9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filemanager/inc/class.filemanager_merge.inc.php
View File

@ -101,7 +101,7 @@ class filemanager_merge extends Api\Storage\Merge
$file['ctime'] = Api\DateTime::to($file['ctime']);
$file['name'] = Vfs::basename($id);
$file['dir'] = Vfs::decodePath(Vfs::dirname($id));
$file['dir'] = ($dir = Vfs::dirname($id)) ? Vfs::decodePath($dir) : '';
$dirlist = explode('/',$file['dir']);
$file['folder'] = array_pop($dirlist);
$file['folder_file'] = $file['folder'] . '/'.$file['name'];