[BUGFIX] Move default avatar image from background css to img tag

If a transparent avatar image is assigned the default avatar no longer
shines through.

Resolves: #70220
Releases: master
Change-Id: I889c706616876d45d0d9a371b96591ec27aa264c
Reviewed-on: https://review.typo3.org/45191
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Frans Saris <franssaris@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>

diff --git a/Build/Resources/Public/Less/Component/avatar.less b/Build/Resources/Public/Less/Component/avatar.less
index 40e58fa..0d1d67f 100644 (file)
--- a/Build/Resources/Public/Less/Component/avatar.less
+++ b/Build/Resources/Public/Less/Component/avatar.less
@@ -62,8 +62,6 @@
        width: @avatar-size;
        overflow: hidden;
        border-radius: @avatar-border-radius;
-       background-image: url('@{path-sysext}/core/Resources/Public/Icons/T3Icons/avatar/avatar-default.svg');
-       background-size: 100%;
        &:after {
                display: block;
                content: '';

diff --git a/typo3/sysext/backend/Classes/Backend/Avatar/Avatar.php b/typo3/sysext/backend/Classes/Backend/Avatar/Avatar.php
index 57e15f3..f808adf 100644 (file)
--- a/typo3/sysext/backend/Classes/Backend/Avatar/Avatar.php
+++ b/typo3/sysext/backend/Classes/Backend/Avatar/Avatar.php
@@ -78,14 +78,19 @@ class Avatar
             $backendUser = $this->getBackendUser()->user;
         }
 
-        $imageTag = '';
         $avatarImage = $this->getImage($backendUser, $size);
 
-        if ($avatarImage) {
-            $imageTag = '<img src="' . htmlspecialchars($avatarImage->getUrl(true)) . '" ' .
-                'width="' . (int)$avatarImage->getWidth() . '" ' .
-                'height="' . (int)$avatarImage->getHeight() . '" />';
+        if (!$avatarImage) {
+            $avatarImage = GeneralUtility::makeInstance(
+                Image::class,
+                'typo3/sysext/core/Resources/Public/Icons/T3Icons/avatar/avatar-default.svg',
+                $size,
+                $size
+            );
         }
+        $imageTag = '<img src="' . htmlspecialchars($avatarImage->getUrl(true)) . '" ' .
+            'width="' . (int)$avatarImage->getWidth() . '" ' .
+            'height="' . (int)$avatarImage->getHeight() . '" />';
 
         return $imageTag;
     }

diff --git a/typo3/sysext/install/Resources/Public/Css/InstallTool.css b/typo3/sysext/install/Resources/Public/Css/InstallTool.css
index 264f5c6..884efec 100644 (file)
--- a/typo3/sysext/install/Resources/Public/Css/InstallTool.css
+++ b/typo3/sysext/install/Resources/Public/Css/InstallTool.css
@@ -7546,8 +7546,6 @@ button.close {
   width: 32px;
   overflow: hidden;
   border-radius: 50%;
-  background-image: url('../../../../../../typo3/sysext/core/Resources/Public/Icons/T3Icons/avatar/avatar-default.svg');
-  background-size: 100%;
 }
 .avatar-image:after {
   display: block;

diff --git a/typo3/sysext/t3skin/Resources/Public/Css/backend.css b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
index 848c289..808fab9 100644 (file)
--- a/typo3/sysext/t3skin/Resources/Public/Css/backend.css
+++ b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
@@ -7555,8 +7555,6 @@ button.close {
   width: 32px;
   overflow: hidden;
   border-radius: 50%;
-  background-image: url('../../../../../../typo3/sysext/core/Resources/Public/Icons/T3Icons/avatar/avatar-default.svg');
-  background-size: 100%;
 }
 .avatar-image:after {
   display: block;