diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/ObjectStore/ObjectStoreStorage.php | 4 | ||||
| -rw-r--r-- | lib/private/Server.php | 2 | ||||
| -rw-r--r-- | lib/private/Settings/Manager.php | 16 |
3 files changed, 19 insertions, 3 deletions
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 83a649e6084..30a946dcc3c 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -476,4 +476,8 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { return $size; } + + public function getObjectStore(): IObjectStore { + return $this->objectStore; + } } diff --git a/lib/private/Server.php b/lib/private/Server.php index 942bef3b638..408b457ec39 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -1093,7 +1093,7 @@ class Server extends ServerContainer implements IServerContainer { $this->registerService('SettingsManager', function (Server $c) { $manager = new \OC\Settings\Manager( $c->getLogger(), - $c->getL10N('lib'), + $c->getL10NFactory(), $c->getURLGenerator(), $c ); diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 7281d7bf72e..982c2dba2ee 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -34,6 +34,7 @@ use OCP\IL10N; use OCP\ILogger; use OCP\IServerContainer; use OCP\IURLGenerator; +use OCP\L10N\IFactory; use OCP\Settings\ISettings; use OCP\Settings\IManager; use OCP\Settings\ISection; @@ -46,6 +47,9 @@ class Manager implements IManager { /** @var IL10N */ private $l; + /** @var IFactory */ + private $l10nFactory; + /** @var IURLGenerator */ private $url; @@ -54,12 +58,12 @@ class Manager implements IManager { public function __construct( ILogger $log, - IL10N $l10n, + IFactory $l10nFactory, IURLGenerator $url, IServerContainer $container ) { $this->log = $log; - $this->l = $l10n; + $this->l10nFactory = $l10nFactory; $this->url = $url; $this->container = $container; } @@ -190,6 +194,10 @@ class Manager implements IManager { * @inheritdoc */ public function getAdminSections(): array { + if ($this->l === null) { + $this->l = $this->l10nFactory->get('lib'); + } + // built-in sections $sections = [ 0 => [new Section('overview', $this->l->t('Overview'), 0, $this->url->imagePath('settings', 'admin.svg'))], @@ -301,6 +309,10 @@ class Manager implements IManager { * @inheritdoc */ public function getPersonalSections(): array { + if ($this->l === null) { + $this->l = $this->l10nFactory->get('lib'); + } + $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'))], |