Merge pull request #12106 from nextcloud/bugfix/noid/federated-settings-logo
Fix logo path in personal federated sharing settings
This commit is contained in:
commit
4a642fc004
|
@ -28,7 +28,6 @@ namespace OCA\FederatedFileSharing\Settings;
|
||||||
use OCA\FederatedFileSharing\FederatedShareProvider;
|
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||||
use OCP\AppFramework\Http\TemplateResponse;
|
use OCP\AppFramework\Http\TemplateResponse;
|
||||||
use OCP\IL10N;
|
use OCP\IL10N;
|
||||||
use OCP\IURLGenerator;
|
|
||||||
use OCP\IUserSession;
|
use OCP\IUserSession;
|
||||||
use OCP\Settings\ISettings;
|
use OCP\Settings\ISettings;
|
||||||
|
|
||||||
|
@ -40,8 +39,6 @@ class Personal implements ISettings {
|
||||||
private $userSession;
|
private $userSession;
|
||||||
/** @var IL10N */
|
/** @var IL10N */
|
||||||
private $l;
|
private $l;
|
||||||
/** @var IURLGenerator */
|
|
||||||
private $urlGenerator;
|
|
||||||
/** @var \OC_Defaults */
|
/** @var \OC_Defaults */
|
||||||
private $defaults;
|
private $defaults;
|
||||||
|
|
||||||
|
@ -49,13 +46,11 @@ class Personal implements ISettings {
|
||||||
FederatedShareProvider $federatedShareProvider, #
|
FederatedShareProvider $federatedShareProvider, #
|
||||||
IUserSession $userSession,
|
IUserSession $userSession,
|
||||||
IL10N $l,
|
IL10N $l,
|
||||||
IURLGenerator $urlGenerator,
|
|
||||||
\OC_Defaults $defaults
|
\OC_Defaults $defaults
|
||||||
) {
|
) {
|
||||||
$this->federatedShareProvider = $federatedShareProvider;
|
$this->federatedShareProvider = $federatedShareProvider;
|
||||||
$this->userSession = $userSession;
|
$this->userSession = $userSession;
|
||||||
$this->l = $l;
|
$this->l = $l;
|
||||||
$this->urlGenerator = $urlGenerator;
|
|
||||||
$this->defaults = $defaults;
|
$this->defaults = $defaults;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,7 +66,7 @@ class Personal implements ISettings {
|
||||||
'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),
|
'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),
|
||||||
'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
|
'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]),
|
'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,
|
'reference' => $url,
|
||||||
'cloudId' => $cloudID,
|
'cloudId' => $cloudID,
|
||||||
'color' => $this->defaults->getColorPrimary(),
|
'color' => $this->defaults->getColorPrimary(),
|
||||||
|
|
Loading…
Reference in New Issue