Browse Source

avoid usage of brand name 'ownCloud'

tags/v6.0.0beta3
Thomas Müller 10 years ago
parent
commit
a90cefcea2
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      apps/files/lib/app.php
  2. 1
    1
      apps/files/tests/ajax_rename.php

+ 1
- 1
apps/files/lib/app.php View File

@@ -57,7 +57,7 @@ class App {
// 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 by ownCloud")
'message' => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved.")
);
// rename to existing file is denied
} else if ($this->view->file_exists($dir . '/' . $newname)) {

+ 1
- 1
apps/files/tests/ajax_rename.php View File

@@ -88,7 +88,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
$result = $this->files->rename($dir, $oldname, $newname);
$expected = array(
'success' => false,
'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved.")
);

$this->assertEquals($expected, $result);

Loading…
Cancel
Save