Index: branches/5.3.x/core/units/helpers/minifiers/minify_helper.php =================================================================== diff -u -N -r15962 -r16195 --- branches/5.3.x/core/units/helpers/minifiers/minify_helper.php (.../minify_helper.php) (revision 15962) +++ branches/5.3.x/core/units/helpers/minifiers/minify_helper.php (.../minify_helper.php) (revision 16195) @@ -1,6 +1,6 @@ resourceFolder . DIRECTORY_SEPARATOR . ($this->debugMode ? 'd' : 'c') . '_'; + /** @var FileHelper $file_helper */ + $file_helper = $this->Application->recallObject('FileHelper'); + if ( $save_as ) { $dst_file .= $save_as . ( strpos($save_as, '.') === false ? '.' . $extension : '' ); } else { - $dst_file .= $this->_getHash($files) . '.' . $extension; + $dst_file .= $this->_getHash($file_helper->makeRelative($files)) . '.' . $extension; } $was_compressed = file_exists($dst_file); @@ -125,9 +128,6 @@ file_put_contents($dst_file, $string); } - $file_helper = $this->Application->recallObject('FileHelper'); - /* @var $file_helper FileHelper */ - return $file_helper->pathToUrl($dst_file) . '?ts=' . date('Y-m-d_H:i:s', filemtime($dst_file)); } @@ -169,7 +169,7 @@ array_unshift($hash, 'A:0;T:' . $this->Application->GetVar('m_theme')); } - return crc32( implode('|', $hash) ); + return kUtil::crc32(implode('|', $hash)); } /** @@ -312,4 +312,4 @@ return $ret; } - } \ No newline at end of file + }