Merge pull request #8026 from owncloud/remove_shared_folder

remove the "Shared" folder

2 files changed, 3 insertions, 6 deletions

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 71f6ae78878..99eca2f38cf 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -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;
 		}
 
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index c89874c94d5..1921ec76af3 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -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',