From 215f143e7075c1317b09d75db170a4d7bb83cfa4 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 4 Sep 2020 23:44:21 +0900
Subject: [PATCH] Fix incorrect ordering of CSS resources

---
 classes/frontendfile/FrontEndFileHandler.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php
index 6c297d9f8..8928431b9 100644
--- a/classes/frontendfile/FrontEndFileHandler.class.php
+++ b/classes/frontendfile/FrontEndFileHandler.class.php
@@ -229,11 +229,11 @@ class FrontEndFileHandler extends Handler
 			{
 				$file->media = 'all';
 			}
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;
+			$file->key = sprintf('%s/%s:%s:%s', $file->filePath, $file->keyName, $file->targetIe, $file->media);
 		}
 		else if($file->fileExtension == 'js')
 		{
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;
+			$file->key = sprintf('%s/%s:%s', $file->filePath, $file->keyName, $file->targetIe);
 		}
 
 		return $file;
@@ -675,7 +675,7 @@ class FrontEndFileHandler extends Handler
 	 */
 	protected function _arrangeCssIndex($dirname, $file)
 	{
-		if ($file->index !== 0)
+		if ($file->index < -100000)
 		{
 			return;
 		}
@@ -688,7 +688,7 @@ class FrontEndFileHandler extends Handler
 		$tmp = array_first(explode('/', strtr($dirname, '\\.', '//')));
 
 		$cssSortList = array('common' => -100000, 'layouts' => -90000, 'modules' => -80000, 'widgets' => -70000, 'addons' => -60000);
-		$file->index = $cssSortList[$tmp];
+		$file->index += $cssSortList[$tmp];
 	}
 	
 	/**