diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-07-03 22:35:46 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-07-03 22:35:46 +0200 |
| commit | f98bd1ad66eae6421ec56a65b7b726f27cd2e027 (patch) | |
| tree | 0a2000c43df0aa6a5eb0bd02cc87eaadb071cd72 /lib | |
| parent | c036700c5451351a580f9c244b1bf6ad5eb9a3a7 (diff) | |
| parent | b1c9785eb3fec9bc12dab8e4984b0b45880e7fa6 (diff) | |
| download | nextcloud-server-f98bd1ad66eae6421ec56a65b7b726f27cd2e027.tar.gz nextcloud-server-f98bd1ad66eae6421ec56a65b7b726f27cd2e027.zip | |
Merge branch 'master' into calendar_import
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/filesystem.php | 1 | ||||
| -rw-r--r-- | lib/filesystemview.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/filesystem.php b/lib/filesystem.php index 0ab3bd69acd..65318fa3ab6 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -153,6 +153,7 @@ class OC_Filesystem{ if($path[0]!=='/'){ $path='/'.$path; } + $path=str_replace('//', '/',$path); $foundMountPoint=''; foreach(OC_Filesystem::$mounts as $mountpoint=>$storage){ if($mountpoint==$path){ diff --git a/lib/filesystemview.php b/lib/filesystemview.php index d474b61b98c..448663bb081 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -314,7 +314,7 @@ class OC_FilesystemView { }else{ $source=$this->fopen($path1,'r'); $target=$this->fopen($path2,'w'); - $count=OC_Helper::streamCopy($source,$target); + $result=OC_Helper::streamCopy($source,$target); } OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2)); if(!$exists){ |