From 6288d4a3abca29c7a7051a564cda5cf50f1bba31 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 4 Mar 2010 23:09:53 +0000 Subject: [PATCH] ENHANCEMENT Combined files now live in assets/.combinedfiles by default git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100529 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- _config.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_config.php b/_config.php index df6408870..f19129bfb 100755 --- a/_config.php +++ b/_config.php @@ -70,4 +70,6 @@ PasswordEncryptor::register('md5', 'PasswordEncryptor_LegacyPHPHash("md5")'); PasswordEncryptor::register('sha1','PasswordEncryptor_LegacyPHPHash("sha1")'); PasswordEncryptor::register('md5_v2.4', 'PasswordEncryptor_PHPHash("md5")'); PasswordEncryptor::register('sha1_v2.4','PasswordEncryptor_PHPHash("sha1")'); -?> \ No newline at end of file + +// Set the default folder for where combined JS/CSS files should live +Requirements::set_combined_files_folder('assets/.combinedfiles'); \ No newline at end of file