Fix notification when image has a missing width/height; fixes #8795

glpi-project · Mar 10, 2021 · 647ad1b · 647ad1b
1 parent f2f6a77
commit 647ad1b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/inc/document.class.php b/inc/document.class.php
@@ -1520,15 +1520,15 @@ public static function isImage($file) {
     * @return string Image path on disk
     */
    public static function getImage($path, $context, $mwidth = null, $mheight = null) {
-      if ($mwidth === null && $mheight === null) {
+      if ($mwidth === null || $mheight === null) {
          switch ($context) {
             case 'mail':
-               $mwidth = 400;
-               $mheight = 300;
+               $mwidth  = $mwidth ?? 400;
+               $mheight = $mheight ?? 300;
                break;
             case 'timeline':
-               $mwidth = 100;
-               $mheight = 100;
+               $mwidth  = $mwidth ?? 100;
+               $mheight = $mheight ?? 100;
                break;
             default:
                throw new \RuntimeException("Unknown context $context!");