diff options
| -rw-r--r-- | apps/files/js/files.js | 2 | ||||
| -rw-r--r-- | apps/files_sharing/public.php | 4 | ||||
| -rw-r--r-- | lib/filecache.php | 8 | ||||
| -rw-r--r-- | lib/filesystemview.php | 5 |
4 files changed, 8 insertions, 11 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 7506000d216..16f7c966067 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -722,7 +722,7 @@ var folderDropOptions={ } var crumbDropOptions={ drop: function( event, ui ) { - var file=ui.draggable.text().trim(); + var file=ui.draggable.parent().data('file'); var target=$(this).data('dir'); var dir=$('#dir').val(); while(dir.substr(0,1)=='/'){//remove extra leading /'s diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 295273d842b..598172aa855 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -70,9 +70,9 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { if (isset($linkItem['share_with'])) { // Check password if (isset($_GET['file'])) { - $url = OCP\Util::linkToPublic('files').'&file='.$_GET['file']; + $url = OCP\Util::linkToPublic('files').'&file='.urlencode($_GET['file']); } else { - $url = OCP\Util::linkToPublic('files').'&dir='.$_GET['dir']; + $url = OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']); } if (isset($_POST['password'])) { $password = $_POST['password']; diff --git a/lib/filecache.php b/lib/filecache.php index 6263e03fc64..4a7dbd0250d 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -502,11 +502,11 @@ class OC_FileCache{ */ public static function triggerUpdate($user='') { if($user) { - $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `mtime`=0 WHERE `user`=? AND `mimetype`="httpd/unix-directory"'); - $query->execute(array($user)); + $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `mtime`=0 WHERE `user`=? AND `mimetype`= ? '); + $query->execute(array($user,'httpd/unix-directory')); }else{ - $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `mtime`=0 AND `mimetype`="httpd/unix-directory"'); - $query->execute(); + $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `mtime`=0 AND `mimetype`= ? '); + $query->execute(array('httpd/unix-directory')); } } } diff --git a/lib/filesystemview.php b/lib/filesystemview.php index 936e1feb412..ccaa040fe88 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -47,10 +47,7 @@ class OC_FilesystemView { $this->fakeRoot=$root; } - public function getAbsolutePath($path) { - if(!$path) { - $path='/'; - } + public function getAbsolutePath($path = '/') { if($path[0]!=='/') { $path='/'.$path; } |