Merge branch 'pkp:main' into f5000_7431

pkp · Mar 21, 2024 · 2685044 · 2685044
2 parents 3fbc316 + a2324e5
commit 2685044
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/classes/template/PKPTemplateManager.php b/classes/template/PKPTemplateManager.php
@@ -25,9 +25,6 @@
 use APP\core\Application;
 use APP\core\PageRouter;
 use APP\core\Request;
-
-require_once('./lib/pkp/lib/vendor/smarty/smarty/libs/plugins/modifier.escape.php'); // Seems to be needed?
-
 use APP\core\Services;
 use APP\facades\Repo;
 use APP\file\PublicFileManager;
@@ -66,6 +63,8 @@
 use Smarty;
 use Smarty_Internal_Template;
 
+require_once('./lib/pkp/lib/vendor/smarty/smarty/libs/plugins/modifier.escape.php'); // Seems to be needed?
+
 /* This definition is required by Smarty */
 define('SMARTY_DIR', Core::getBaseDir() . '/lib/pkp/lib/vendor/smarty/smarty/libs/');
 
@@ -505,10 +504,10 @@ public function cacheLess($path, $styles)
      */
     public function getCachedLessFilePath($name)
     {
-        $cacheDirectory = CacheManager::getFileCachePath();
-        $context = $this->_request->getContext();
-        $contextId = $context instanceof Context ? $context->getId() : 0;
-        return "{$cacheDirectory}/{$contextId}-{$name}.css";
+        $directory = CacheManager::getFileCachePath();
+        $contextId = $this->_request->getContext()?->getId() ?? 0;
+        $hash = crc32($this->_request->getBaseUrl());
+        return "{$directory}/{$contextId}-{$name}-{$hash}.css";
     }
 
     /**