From 72dcff22f72a1aa65ae3356bd116e51966f9a5bc Mon Sep 17 00:00:00 2001
From: Diogo Peralta Cordeiro <mail@diogo.site>
Date: Thu, 22 Jul 2021 12:32:49 +0100
Subject: [PATCH] [MEDIA] We need permissions to run chmod in directories It's
 better to have in the filename data that we couldnt't otherwise rapidly
 retrieve

---
 src/Entity/AttachmentThumbnail.php | 2 +-
 src/Util/TemporaryFile.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Entity/AttachmentThumbnail.php b/src/Entity/AttachmentThumbnail.php
index d253b79566..bcf2c83090 100644
--- a/src/Entity/AttachmentThumbnail.php
+++ b/src/Entity/AttachmentThumbnail.php
@@ -163,7 +163,7 @@ class AttachmentThumbnail extends Entity
             if (in_array($major_mime, array_keys($event_map)) && !Event::handle($event_map[$major_mime], [$attachment->getPath(), $temp->getRealPath(), &$width, &$height, $crop, &$mimetype])) {
                 $thumbnail->setWidth($predicted_width);
                 $thumbnail->setHeight($predicted_height);
-                $filename = "{$width}x{$height}{$ext}-" . $attachment->getFileHash();
+                $filename = "{$predicted_width}x{$predicted_height}{$ext}-" . $attachment->getFileHash();
                 $temp->move(Common::config('thumbnail', 'dir'), $filename);
                 $thumbnail->setFilename($filename);
                 DB::persist($thumbnail);
diff --git a/src/Util/TemporaryFile.php b/src/Util/TemporaryFile.php
index 0de3e0553d..24260641ad 100644
--- a/src/Util/TemporaryFile.php
+++ b/src/Util/TemporaryFile.php
@@ -145,7 +145,7 @@ class TemporaryFile extends \SplFileInfo
      *
      * @return void
      */
-    public function move(string $directory, string $filename, int $dirmode = 0655, int $filemode = 0644): void
+    public function move(string $directory, string $filename, int $dirmode = 0755, int $filemode = 0644): void
     {
         if (!is_dir($directory)) {
             if (false === @mkdir($directory, $dirmode, true) && !is_dir($directory)) {