mirror of
https://github.com/nextcloud/server.git
synced 2024-08-18 02:10:32 +02:00
Nuke the legacy storage fallback from orbit
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
parent
91c87d3a7a
commit
4744dce4df
@ -39,9 +39,6 @@ class LocalHomeMountProvider implements IHomeMountProvider {
|
||||
*/
|
||||
public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
|
||||
$arguments = ['user' => $user];
|
||||
if (\OC\Files\Cache\Storage::exists('local::' . $user->getHome() . '/')) {
|
||||
$arguments['legacy'] = true;
|
||||
}
|
||||
return new MountPoint('\OC\Files\Storage\Home', '/' . $user->getUID(), $arguments, $loader);
|
||||
}
|
||||
}
|
||||
|
@ -44,19 +44,12 @@ class Home extends Local implements \OCP\Files\IHomeStorage {
|
||||
/**
|
||||
* Construct a Home storage instance
|
||||
* @param array $arguments array with "user" containing the
|
||||
* storage owner and "legacy" containing "true" if the storage is
|
||||
* a legacy storage with "local::" URL instead of the new "home::" one.
|
||||
* storage owner
|
||||
*/
|
||||
public function __construct($arguments) {
|
||||
$this->user = $arguments['user'];
|
||||
$datadir = $this->user->getHome();
|
||||
if (isset($arguments['legacy']) && $arguments['legacy']) {
|
||||
// legacy home id (<= 5.0.12)
|
||||
$this->id = 'local::' . $datadir . '/';
|
||||
}
|
||||
else {
|
||||
$this->id = 'home::' . $this->user->getUID();
|
||||
}
|
||||
$this->id = 'home::' . $this->user->getUID();
|
||||
|
||||
parent::__construct(array('datadir' => $datadir));
|
||||
}
|
||||
|
@ -88,14 +88,6 @@ class HomeTest extends Storage {
|
||||
$this->assertEquals('home::' . $this->userId, $this->instance->getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that the legacy home id is in the format local::/path/to/datadir/user1/
|
||||
*/
|
||||
public function testLegacyId() {
|
||||
$this->instance = new \OC\Files\Storage\Home(array('user' => $this->user, 'legacy' => true));
|
||||
$this->assertEquals('local::' . $this->tmpDir . '/', $this->instance->getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that getCache() returns an instance of HomeCache
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user