diff options
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Cache/File.php | 2 | ||||
| -rw-r--r-- | lib/private/Repair.php | 4 | ||||
| -rw-r--r-- | lib/private/Settings/Manager.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/private/Cache/File.php b/lib/private/Cache/File.php index 7d2d468ec2f..fdf7606de0f 100644 --- a/lib/private/Cache/File.php +++ b/lib/private/Cache/File.php @@ -174,7 +174,7 @@ class File implements ICache { */ public function gc() { $storage = $this->getStorage(); - if ($storage and $storage->is_dir('/')) { + if ($storage) { // extra hour safety, in case of stray part chunks that take longer to write, // because touch() is only called after the chunk was finished $now = time() - 3600; diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 8746f1e6f27..27746993443 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -47,6 +47,8 @@ use OC\Repair\RepairMimeTypes; use OC\Repair\RepairInvalidShares; use OC\Template\JSCombiner; use OC\Template\SCSSCacher; +use OCA\DAV\Connector\Sabre\Principal; +use OCA\DAV\Repair\RemoveInvalidShares; use OCP\AppFramework\QueryException; use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; @@ -146,7 +148,7 @@ class Repair implements IOutput{ */ public static function getExpensiveRepairSteps() { return [ - new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()) + new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()), ]; } diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index becc670c6f9..d8130ed6b5b 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -350,7 +350,7 @@ class Manager implements IManager { $sections = [ 0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))], 5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))], - 15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))], + 15 => [new Section('sync-clients', $this->l->t('Mobile & desktop'), 0, $this->url->imagePath('core', 'clients/phone.svg'))], ]; $legacyForms = \OC_App::getForms('personal'); |