From b92b29af0597bc7136187ef9f5ce041f59f8529d Mon Sep 17 00:00:00 2001
From: Francesco Boes <francesco@onoratogroup.org>
Date: Wed, 22 May 2024 16:38:54 +0200
Subject: [PATCH 1/4] Last file timestamp added in JS and CSS merge

---
 .../core/Mage/Core/Model/Design/Package.php    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php
index c10a40af2d8..d2bf1931b4c 100644
--- a/app/code/core/Mage/Core/Model/Design/Package.php
+++ b/app/code/core/Mage/Core/Model/Design/Package.php
@@ -684,7 +684,14 @@ public static function getPackageByUserAgent(array $rules, $regexpsConfigPath =
      */
     public function getMergedJsUrl($files)
     {
-        $targetFilename = md5(implode(',', $files)) . '.js';
+        $olderTimestamp = '';
+        foreach ($files as $file) {
+            if ($olderTimestamp < filemtime($file)) {
+                $olderTimestamp = filemtime($file);
+            }
+        }
+
+        $targetFilename = md5(implode(',', $files) . "|{$olderTimestamp}") . '.js';
         $targetDir = $this->_initMergerDir('js');
         if (!$targetDir) {
             return '';
@@ -720,7 +727,14 @@ public function getMergedCssUrl($files)
         }
 
         // merge into target file
-        $targetFilename = md5(implode(',', $files) . "|{$hostname}|{$port}") . '.css';
+        $olderTimestamp = '';
+        foreach ($files as $file) {
+            if ($olderTimestamp < filemtime($file)) {
+                $olderTimestamp = filemtime($file);
+            }
+        }
+
+        $targetFilename = md5(implode(',', $files) . "|{$hostname}|{$port}|{$olderTimestamp}") . '.css';
         $mergeFilesResult = $this->_mergeFiles(
             $files,
             $targetDir . DS . $targetFilename,

From b10cae95828ac40aa91d8e119c46a30c283fa8da Mon Sep 17 00:00:00 2001
From: Francesco Boes <francesco@onoratogroup.org>
Date: Tue, 28 May 2024 21:49:04 +0200
Subject: [PATCH 2/4] Fixed ambiguities in the variable name

---
 .../core/Mage/Core/Model/Design/Package.php    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php
index d2bf1931b4c..a7f34719857 100644
--- a/app/code/core/Mage/Core/Model/Design/Package.php
+++ b/app/code/core/Mage/Core/Model/Design/Package.php
@@ -684,14 +684,15 @@ public static function getPackageByUserAgent(array $rules, $regexpsConfigPath =
      */
     public function getMergedJsUrl($files)
     {
-        $olderTimestamp = '';
+        $newestTimestamp = '';
         foreach ($files as $file) {
-            if ($olderTimestamp < filemtime($file)) {
-                $olderTimestamp = filemtime($file);
+            $filemtime = filemtime($file);
+            if ($filemtime > $newestTimestamp) {
+                $newestTimestamp = $filemtime;
             }
         }
 
-        $targetFilename = md5(implode(',', $files) . "|{$olderTimestamp}") . '.js';
+        $targetFilename = md5(implode(',', $files) . "|{$newestTimestamp}") . '.js';
         $targetDir = $this->_initMergerDir('js');
         if (!$targetDir) {
             return '';
@@ -727,14 +728,15 @@ public function getMergedCssUrl($files)
         }
 
         // merge into target file
-        $olderTimestamp = '';
+        $newestTimestamp = '';
         foreach ($files as $file) {
-            if ($olderTimestamp < filemtime($file)) {
-                $olderTimestamp = filemtime($file);
+            $filemtime = filemtime($file);
+            if ($filemtime > $newestTimestamp) {
+                $newestTimestamp = $filemtime;
             }
         }
 
-        $targetFilename = md5(implode(',', $files) . "|{$hostname}|{$port}|{$olderTimestamp}") . '.css';
+        $targetFilename = md5(implode(',', $files) . "|{$hostname}|{$port}|{$newestTimestamp}") . '.css';
         $mergeFilesResult = $this->_mergeFiles(
             $files,
             $targetDir . DS . $targetFilename,

From 86d0b42c3e97ea7d804c86cd174b28987dac7d1e Mon Sep 17 00:00:00 2001
From: Francesco Boes <francescofabio@live.it>
Date: Tue, 28 May 2024 22:05:37 +0200
Subject: [PATCH 3/4] Update app/code/core/Mage/Core/Model/Design/Package.php

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
---
 app/code/core/Mage/Core/Model/Design/Package.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php
index a7f34719857..04f7948b9ca 100644
--- a/app/code/core/Mage/Core/Model/Design/Package.php
+++ b/app/code/core/Mage/Core/Model/Design/Package.php
@@ -684,7 +684,7 @@ public static function getPackageByUserAgent(array $rules, $regexpsConfigPath =
      */
     public function getMergedJsUrl($files)
     {
-        $newestTimestamp = '';
+        $newestTimestamp = 0;
         foreach ($files as $file) {
             $filemtime = filemtime($file);
             if ($filemtime > $newestTimestamp) {

From 8bc10abf8068d641fc3a1ab18ec6534b394d0fb5 Mon Sep 17 00:00:00 2001
From: Francesco Boes <francescofabio@live.it>
Date: Tue, 28 May 2024 22:05:41 +0200
Subject: [PATCH 4/4] Update app/code/core/Mage/Core/Model/Design/Package.php

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
---
 app/code/core/Mage/Core/Model/Design/Package.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php
index 04f7948b9ca..6ae0356fea1 100644
--- a/app/code/core/Mage/Core/Model/Design/Package.php
+++ b/app/code/core/Mage/Core/Model/Design/Package.php
@@ -728,7 +728,7 @@ public function getMergedCssUrl($files)
         }
 
         // merge into target file
-        $newestTimestamp = '';
+        $newestTimestamp = 0;
         foreach ($files as $file) {
             $filemtime = filemtime($file);
             if ($filemtime > $newestTimestamp) {