From 1b60ef19f954239320bd07f1e271984d48d96335 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 2 Jul 2016 12:28:58 +0200 Subject: [PATCH] fix Scrutinizer "bugs" --- filemanager/inc/class.filemanager_merge.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filemanager/inc/class.filemanager_merge.inc.php b/filemanager/inc/class.filemanager_merge.inc.php index 99b13491f4..1f7ebf0f22 100644 --- a/filemanager/inc/class.filemanager_merge.inc.php +++ b/filemanager/inc/class.filemanager_merge.inc.php @@ -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'];