From dd64c562cb808f5bd895764af680692e10b7951f Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Fri, 5 Mar 2010 02:23:51 +0000 Subject: [PATCH] ENHANCEMENT Stored combined files in assets/_combinedfiles by default git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100536 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Requirements.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/Requirements.php b/core/Requirements.php index 80e15921e..687bd5943 100644 --- a/core/Requirements.php +++ b/core/Requirements.php @@ -389,7 +389,12 @@ class Requirements_Backend { */ public $combine_js_with_jsmin = true; - protected $combinedFilesFolder; + /** + * By default, combined files are stored in assets/_combinedfiles. + * Set this by calling Requirements::set_combined_files_folder() + * @var string + */ + protected $combinedFilesFolder = 'assets/_combinedfiles'; /** * Put all javascript includes at the bottom of the template