Merge tag v2.1.46 into develop

roadiz · Sep 28, 2023 · 570d58f · 570d58f
1 parent fff2c93
commit 570d58f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/AbstractDocumentFactory.php b/src/AbstractDocumentFactory.php
@@ -231,7 +231,7 @@ public function updateDocument(DocumentInterface $document): DocumentInterface
                 }
             }
 
-            $document->setFolder(substr(hash("crc32b", date('YmdHi')), 0, 12));
+            $document->setFolder(\mb_substr(hash("crc32b", date('YmdHi')), 0, 12));
         }
 
         $document->setFilename($this->getFileName());

diff --git a/src/Models/DocumentTrait.php b/src/Models/DocumentTrait.php
@@ -271,7 +271,7 @@ public function isEmbed(): bool
 
     protected function initDocumentTrait(): void
     {
-        $this->setFolder(substr(hash("crc32b", date('YmdHi')), 0, 12));
+        $this->setFolder(\mb_substr(hash("crc32b", date('YmdHi')), 0, 12));
     }
 
     #[

diff --git a/src/TwigExtension/DocumentExtension.php b/src/TwigExtension/DocumentExtension.php
@@ -70,7 +70,7 @@ public function getFilters(): array
     public function formatBytes($bytes, int $precision = 2): string
     {
         $size = ['B','kB','MB','GB','TB','PB','EB','ZB','YB'];
-        $factor = floor((strlen((string) $bytes) - 1) / 3);
+        $factor = floor((\mb_strlen((string) $bytes) - 1) / 3);
         return sprintf("%.{$precision}f", (int) $bytes / pow(1024, $factor)) . @$size[$factor];
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
-                $document->setFolder(substr(hash("crc32b", date('YmdHi')), 0, 12));
+                $document->setFolder(\mb_substr(hash("crc32b", date('YmdHi')), 0, 12));
             }
             $document->setFilename($this->getFileName());
@@ Expand Down @@