From 5d23ac2f167d63d9e0872a3a8eff63d6c46f7afe Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 3 May 2016 21:57:37 +0900 Subject: [PATCH] Simplify path handling --- classes/frontendfile/FrontEndFileHandler.class.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php index 60286d88b..62b67d19b 100644 --- a/classes/frontendfile/FrontEndFileHandler.class.php +++ b/classes/frontendfile/FrontEndFileHandler.class.php @@ -395,9 +395,7 @@ class FrontEndFileHandler extends Handler { foreach($indexedMap as $file) { - $noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : ''; - $fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache; - + $fullFilePath = $file->filePath . '/' . $file->fileName . '?' . date('YmdHis', filemtime($file->fileFullPath)); $result[] = array('file' => $fullFilePath, 'media' => $file->media, 'targetie' => $file->targetIe); } } @@ -431,9 +429,7 @@ class FrontEndFileHandler extends Handler { foreach($indexedMap as $file) { - $noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : ''; - $fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache; - + $fullFilePath = $file->filePath . '/' . $file->fileName . '?' . date('YmdHis', filemtime($file->fileFullPath)); $result[] = array('file' => $fullFilePath, 'targetie' => $file->targetIe); } }