diff options
| author | Simon L <szaimen@e.mail.de> | 2022-09-13 20:04:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-13 20:04:00 +0200 |
| commit | 4baa09d56b5c191ec4d845a2a8cada47ce164f0f (patch) | |
| tree | 18e140b7b4b00296ab26028864eeed49a63f1219 /apps | |
| parent | b739dd580743aa3c339eba28c45f14d930956135 (diff) | |
| parent | 7d6d65600ef432f440d354789fa48c9dd5013f40 (diff) | |
| download | nextcloud-server-4baa09d56b5c191ec4d845a2a8cada47ce164f0f.tar.gz nextcloud-server-4baa09d56b5c191ec4d845a2a8cada47ce164f0f.zip | |
Merge pull request #34057 from nextcloud/bugfix/noid/fix-2fa-providers-dark-mode
Fix twofactor provider icons in dark mode
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings/lib/Settings/Personal/Security/TwoFactor.php | 1 | ||||
| -rw-r--r-- | apps/settings/templates/settings/personal/security/twofactor.php | 12 |
2 files changed, 2 insertions, 11 deletions
diff --git a/apps/settings/lib/Settings/Personal/Security/TwoFactor.php b/apps/settings/lib/Settings/Personal/Security/TwoFactor.php index 726fc99943a..c356442a628 100644 --- a/apps/settings/lib/Settings/Personal/Security/TwoFactor.php +++ b/apps/settings/lib/Settings/Personal/Security/TwoFactor.php @@ -72,7 +72,6 @@ class TwoFactor implements ISettings { public function getForm(): TemplateResponse { return new TemplateResponse('settings', 'settings/personal/security/twofactor', [ 'twoFactorProviderData' => $this->getTwoFactorProviderData(), - 'themedark' => $this->config->getUserValue($this->uid, 'accessibility', 'theme', false) ]); } diff --git a/apps/settings/templates/settings/personal/security/twofactor.php b/apps/settings/templates/settings/personal/security/twofactor.php index 3d85f4505c3..3fa63bd6d28 100644 --- a/apps/settings/templates/settings/personal/security/twofactor.php +++ b/apps/settings/templates/settings/personal/security/twofactor.php @@ -40,18 +40,10 @@ declare(strict_types=1); $provider = $data['provider']; //Handle 2FA provider icons and theme if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) { - if ($_['themedark']) { - $icon = $provider->getLightIcon(); - } else { - $icon = $provider->getDarkIcon(); - } + $icon = $provider->getDarkIcon(); //fallback icon if the 2factor provider doesn't provide an icon. } else { - if ($_['themedark']) { - $icon = image_path('core', 'actions/password-white.svg'); - } else { - $icon = image_path('core', 'actions/password.svg'); - } + $icon = image_path('core', 'actions/password.svg'); } /** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */ $settings = $data['settings']; |