diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-04-08 17:17:48 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-04-23 12:54:25 +0200 |
| commit | 27c5a978f91e7aa447a2acca040fd173baba53b9 (patch) | |
| tree | 462029db1f2b24055f82967f1e5cf4e5736f9d2c /apps/files/lib | |
| parent | 83d68107253834aa5322198295c827d94e951e90 (diff) | |
| download | nextcloud-server-27c5a978f91e7aa447a2acca040fd173baba53b9.tar.gz nextcloud-server-27c5a978f91e7aa447a2acca040fd173baba53b9.zip | |
we no longer need to handle the Shared folder different from any other folder
Diffstat (limited to 'apps/files/lib')
| -rw-r--r-- | apps/files/lib/app.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php index adfca669577..ed4aa32c662 100644 --- a/apps/files/lib/app.php +++ b/apps/files/lib/app.php @@ -54,13 +54,8 @@ class App { 'data' => NULL ); - // rename to "/Shared" is denied - if( $dir === '/' and $newname === 'Shared' ) { - $result['data'] = array( - 'message' => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved.") - ); // rename to non-existing folder is denied - } else if (!$this->view->file_exists($dir)) { + if (!$this->view->file_exists($dir)) { $result['data'] = array('message' => (string)$this->l10n->t( 'The target folder has been moved or deleted.', array($dir)), @@ -68,7 +63,7 @@ class App { ); // rename to existing file is denied } else if ($this->view->file_exists($dir . '/' . $newname)) { - + $result['data'] = array( 'message' => $this->l10n->t( "The name %s is already used in the folder %s. Please choose a different name.", @@ -77,8 +72,6 @@ class App { } else if ( // rename to "." is denied $newname !== '.' and - // rename of "/Shared" is denied - !($dir === '/' and $oldname === 'Shared') and // THEN try to rename $this->view->rename($dir . '/' . $oldname, $dir . '/' . $newname) ) { |