diff options
Diffstat (limited to 'apps/files/lib/files.php')
| -rw-r--r-- | apps/files/lib/files.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/files/lib/files.php b/apps/files/lib/files.php index 3cbeb384794..02582eff20a 100644 --- a/apps/files/lib/files.php +++ b/apps/files/lib/files.php @@ -45,16 +45,16 @@ class Files { 'data' => NULL ); - // rename to "Shared" in root directory denied + // rename to "/Shared" is denied if( $dir === '/' and $newname === 'Shared' ) { $result['data'] = array( - 'message' => $this->t("Invalid folder name. Usage of 'Shared' is reserved by Owncloud") + 'message' => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved by Owncloud") ); } elseif( // rename to "." is denied $newname !== '.' and - // rename to "Shared" inside the root directory is denied - !($dir === '/' and $file === 'Shared') and + // rename of "/Shared" is denied + !($dir === '/' and $oldname === 'Shared') and // THEN try to rename \OC\Files\Filesystem::rename( \OC\Files\Filesystem::normalizePath($dir . '/' . $oldname), @@ -71,7 +71,7 @@ class Files { } else { // rename failed $result['data'] = array( - 'message' => $this->t('Unable to rename file') + 'message' => $this->l10n->t('Unable to rename file') ); } return $result; |