Merge pull request #3892 from sb-relaxt-at/3891-Wrong-temp-folder-in-tiny_mce_gzip

Changed cache_dir to respect TEMP_FOLDER
This commit is contained in:
Daniel Hensby 2015-02-17 10:15:43 +00:00
commit 99bc79a48d

View File

@ -12,14 +12,14 @@
$frameworkPath = rtrim(dirname(dirname(dirname(__FILE__))), DIRECTORY_SEPARATOR); $frameworkPath = rtrim(dirname(dirname(dirname(__FILE__))), DIRECTORY_SEPARATOR);
$basePath = rtrim(dirname($frameworkPath), DIRECTORY_SEPARATOR); $basePath = rtrim(dirname($frameworkPath), DIRECTORY_SEPARATOR);
require_once $frameworkPath . '/core/TempPath.php'; require_once $frameworkPath . '/core/Constants.php';
// Handle incoming request if it's a script call // Handle incoming request if it's a script call
if (TinyMCE_Compressor::getParam("js")) { if (TinyMCE_Compressor::getParam("js")) {
// Default settings // Default settings
$tinyMCECompressor = new TinyMCE_Compressor(array( $tinyMCECompressor = new TinyMCE_Compressor(array(
// CUSTOM SilverStripe // CUSTOM SilverStripe
'cache_dir' => getTempFolder($basePath) 'cache_dir' => TEMP_FOLDER
// CUSTOM END // CUSTOM END
)); ));