From 4bb565dd5102cc2bdaf517e87f591fcf727c66b1 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 9 Jan 2016 10:39:33 +0900
Subject: [PATCH] Fix error when loading two or more files with the same
 basename

---
 classes/frontendfile/FrontEndFileHandler.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php
index 773999404..bba93c605 100644
--- a/classes/frontendfile/FrontEndFileHandler.class.php
+++ b/classes/frontendfile/FrontEndFileHandler.class.php
@@ -215,6 +215,7 @@ class FrontEndFileHandler extends Handler
 				$file->fileName = $minifiedFileHash . '.' . $minifiedFileName;
 				$file->filePath = $this->_getAbsFileUrl('./files/cache/minify');
 				$file->fileRealPath = _XE_PATH_ . 'files/cache/minify';
+				$file->keyName = $minifiedFileHash . '.' . $file->fileNameNoExt . '.' . $file->fileExtension;
 				$file->cdnPath = $this->_normalizeFilePath('./files/cache/minify');
 				$file->isMinified = true;
 			}