From bfa13f2404c8c43f5cb33677fb438d23deb63929 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Fri, 5 Mar 2010 01:36:34 +0000 Subject: [PATCH] MINOR Reverted default location for combined JS/CSS as you can't customise this easily git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100534 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- _config.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/_config.php b/_config.php index f19129bfb..1b1961af1 100755 --- a/_config.php +++ b/_config.php @@ -69,7 +69,4 @@ PasswordEncryptor::register('none', 'PasswordEncryptor_None'); 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")'); - -// 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 +PasswordEncryptor::register('sha1_v2.4','PasswordEncryptor_PHPHash("sha1")'); \ No newline at end of file