Browse code

[Bugfix] Consider empty imgSize in avatar insert tag

Sebastian Zoglowek authored on15/08/2022 20:18:02
Showing3 changed files
... ...
@@ -72,7 +72,7 @@ detail pages.
72 72
     ![Admin View: Member overview](https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/default_avatar.jpg)
73 73
     ![Admin View: Member settings](https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/default_avatar_setup.jpg)
74 74
 
75
-2. To display your members, you need to setup a memberlist
75
+2. To display your members, you need to set up a memberlist
76 76
    1. Create the front end module *memberlist*
77 77
    2. Choose the member groups and the member fields that should be displayed
78 78
    3. Optionally you can set up a redirect page to your memberreader
... ...
@@ -252,7 +252,7 @@ class Member extends Frontend
252 252
     /**
253 253
      * Parses an avatar to the template
254 254
      */
255
-    public static function parseMemberAvatar(?MemberModel $objMember, &$objTemplate, $strImgSize): void
255
+    public static function parseMemberAvatar(?MemberModel $objMember, &$objTemplate, ?string $strImgSize): void
256 256
     {
257 257
         $objTemplate->addImage= true;
258 258
 
... ...
@@ -274,7 +274,13 @@ class Member extends Frontend
274 274
         }
275 275
 
276 276
         $objTemplate->addFallbackImage = false;
277
-        $arrData = ['singleSRC'=>$objFile->path, 'size'=>$strImgSize];
277
+
278
+        $arrData = ['singleSRC'=>$objFile->path];
279
+
280
+        if (null !== $strImgSize)
281
+        {
282
+            $arrData['size'] = $strImgSize;
283
+        }
278 284
 
279 285
         //ToDo: Change to FigureBuilder in the future
280 286
         $objTemplate->addImageToTemplate($objTemplate, $arrData, null, null, $objFile);
... ...
@@ -90,10 +90,14 @@ class InsertTagsListener
90 90
         {
91 91
             case 'avatar':
92 92
             {
93
-                $strImgSize = $this->convertImgSize($elements[3]);
93
+                if (isset($elements[3]))
94
+                {
95
+                    $strImgSize = $this->convertImgSize($elements[3]);
96
+                }
97
+
94 98
                 $objTemplate = new FrontendTemplate('memberExtension_image');
95 99
 
96
-                Member::parseMemberAvatar($objMember, $objTemplate, $strImgSize);
100
+                Member::parseMemberAvatar($objMember, $objTemplate, $strImgSize ?? null);
97 101
 
98 102
                 return $objTemplate->parse();
99 103
             }