diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-06-04 12:46:22 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-06-04 12:46:22 +0200 |
| commit | 8755fd88bbcf0468f7ccd35054a07b35133bde13 (patch) | |
| tree | acb6c695fd71270a694b24a8cda9f59232e03de9 /lib | |
| parent | 1e6802e5678ed832bcdba8bcc9beb86ecabeecf2 (diff) | |
| parent | 4eba41a2a04d119b4d73f62f32daaa2f707cd1d9 (diff) | |
| download | nextcloud-server-8755fd88bbcf0468f7ccd35054a07b35133bde13.tar.gz nextcloud-server-8755fd88bbcf0468f7ccd35054a07b35133bde13.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/files.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/files.php b/lib/files.php index 79d214665de..885f6977fbd 100644 --- a/lib/files.php +++ b/lib/files.php @@ -170,7 +170,7 @@ class OC_Files { * @param file $target */ public static function move($sourceDir,$source,$targetDir,$target){ - if(OC_User::isLoggedIn()){ + if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')){ $targetFile=self::normalizePath($targetDir.'/'.$target); $sourceFile=self::normalizePath($sourceDir.'/'.$source); return OC_Filesystem::rename($sourceFile,$targetFile); @@ -224,7 +224,7 @@ class OC_Files { * @param file $name */ public static function delete($dir,$file){ - if(OC_User::isLoggedIn()){ + if(OC_User::isLoggedIn() && ($dir!= '' || $file != 'Shared')) { $file=$dir.'/'.$file; return OC_Filesystem::unlink($file); } |