Added filemtime to merged JS/CSS hash calculation algorithm (#4004)

Co-authored-by: Francesco Boes <francesco@onoratogroup.org> Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
OpenMage · May 29, 2024 · 1fcf745 · 1fcf745
1 parent 1f32c70
commit 1fcf745
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php
@@ -684,7 +684,15 @@ public static function getPackageByUserAgent(array $rules, $regexpsConfigPath =
      */
     public function getMergedJsUrl($files)
     {
-        $targetFilename = md5(implode(',', $files)) . '.js';
+        $newestTimestamp = 0;
+        foreach ($files as $file) {
+            $filemtime = filemtime($file);
+            if ($filemtime > $newestTimestamp) {
+                $newestTimestamp = $filemtime;
+            }
+        }
+
+        $targetFilename = md5(implode(',', $files) . "|{$newestTimestamp}") . '.js';
         $targetDir = $this->_initMergerDir('js');
         if (!$targetDir) {
             return '';
@@ -720,7 +728,15 @@ public function getMergedCssUrl($files)
         }
 
         // merge into target file
-        $targetFilename = md5(implode(',', $files) . "|{$hostname}|{$port}") . '.css';
+        $newestTimestamp = 0;
+        foreach ($files as $file) {
+            $filemtime = filemtime($file);
+            if ($filemtime > $newestTimestamp) {
+                $newestTimestamp = $filemtime;
+            }
+        }
+
+        $targetFilename = md5(implode(',', $files) . "|{$hostname}|{$port}|{$newestTimestamp}") . '.css';
         $mergeFilesResult = $this->_mergeFiles(
             $files,
             $targetDir . DS . $targetFilename,