From 4dda244ce22fe00b72e6f353e0f9fe3daab350b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 29 Oct 2018 13:12:23 +0100 Subject: [PATCH] Fix logo path in personal federated sharing settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/federatedfilesharing/lib/Settings/Personal.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/federatedfilesharing/lib/Settings/Personal.php b/apps/federatedfilesharing/lib/Settings/Personal.php index e7522d0c963..1379c25478e 100644 --- a/apps/federatedfilesharing/lib/Settings/Personal.php +++ b/apps/federatedfilesharing/lib/Settings/Personal.php @@ -28,7 +28,6 @@ namespace OCA\FederatedFileSharing\Settings; use OCA\FederatedFileSharing\FederatedShareProvider; use OCP\AppFramework\Http\TemplateResponse; use OCP\IL10N; -use OCP\IURLGenerator; use OCP\IUserSession; use OCP\Settings\ISettings; @@ -40,8 +39,6 @@ class Personal implements ISettings { private $userSession; /** @var IL10N */ private $l; - /** @var IURLGenerator */ - private $urlGenerator; /** @var \OC_Defaults */ private $defaults; @@ -49,13 +46,11 @@ class Personal implements ISettings { FederatedShareProvider $federatedShareProvider, # IUserSession $userSession, IL10N $l, - IURLGenerator $urlGenerator, \OC_Defaults $defaults ) { $this->federatedShareProvider = $federatedShareProvider; $this->userSession = $userSession; $this->l = $l; - $this->urlGenerator = $urlGenerator; $this->defaults = $defaults; } @@ -71,7 +66,7 @@ class Personal implements ISettings { 'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(), 'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]), 'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]), - 'logoPath' => $this->urlGenerator->imagePath('core', 'logo.svg'), + 'logoPath' => $this->defaults->getLogo(), 'reference' => $url, 'cloudId' => $cloudID, 'color' => $this->defaults->getColorPrimary(),