rollback 12571-12581

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12676 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-02-04 05:48:33 +00:00
parent eac2272e05
commit 6ada9a3639
2 changed files with 5 additions and 8 deletions

View file

@ -102,10 +102,7 @@
$file->filePath = $this->_getAbsFileUrl($pathInfo['dirname']);
$file->fileRealPath = FileHandler::getRealPath($pathInfo['dirname']);
$file->fileExtension = strtolower($pathInfo['extension']);
// Remove .min
$file->fileNameNoExt = preg_replace("/\.{$file->fileExtension}$/", '', $file->fileName);
$file->fileNameNoExt = preg_replace("/\.min$/", '', $file->fileNameNoExt);
$file->fileNameNoExt = preg_replace('/\.min$/', '', $pathInfo['filename']);
$file->keyName = implode('.', array($file->fileNameNoExt, $file->fileExtension));
if(strpos($file->filePath, '://') === FALSE)