wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid usage of brand name 'ownCloud'

Browse source
This commit is contained in:
Thomas Müller 2013-10-28 21:42:48 +01:00
parent 4750fbc226
commit a90cefcea2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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)) {

2
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);