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

external storages: allow to mount a folder called "Shared", it is no longer a reserved name

Browse source
This commit is contained in:
Bjoern Schiessle 2014-04-14 10:15:43 +02:00
parent c9bd2f7a6c
commit 22e0a4b9a8
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_external/lib/config.php
View file

@ -373,8 +373,8 @@ class OC_Mount_Config {
$isPersonal = false) {
$backends = self::getBackends();
$mountPoint = OC\Files\Filesystem::normalizePath($mountPoint);
if ($mountPoint === '' || $mountPoint === '/' || $mountPoint == '/Shared') {
// can't mount at root or "Shared" folder
if ($mountPoint === '' || $mountPoint === '/') {
// can't mount at root folder
return false;
}

5
apps/files_external/tests/mountconfig.php
View file

@ -128,9 +128,6 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
$isPersonal = false;
$this->assertFalse(OC_Mount_Config::addMountPoint('', $storageClass, array(), $mountType, $applicable, $isPersonal));
$this->assertFalse(OC_Mount_Config::addMountPoint('/', $storageClass, array(), $mountType, $applicable, $isPersonal));
$this->assertFalse(OC_Mount_Config::addMountPoint('Shared', $storageClass, array(), $mountType, $applicable, $isPersonal));
$this->assertFalse(OC_Mount_Config::addMountPoint('/Shared', $storageClass, array(), $mountType, $applicable, $isPersonal));
}
/**
@ -488,7 +485,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
'root' => 'someroot'
);
// add mount point as "test" user
// add mount point as "test" user
$this->assertTrue(
OC_Mount_Config::addMountPoint(
'/ext',