From f04470ddf03f53d9e4b3c81514f154824b2ace86 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Mon, 4 Oct 2010 05:53:25 +0000 Subject: [PATCH] MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php (from r100530) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111626 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/LeftAndMain.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 61d95bfd..c52bee11 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -271,7 +271,7 @@ class LeftAndMain extends Controller { // Javascript combined files Requirements::combine_files( - 'assets/_base.js', + '_base.js', array( 'sapphire/thirdparty/prototype/prototype.js', 'sapphire/thirdparty/behaviour/behaviour.js', @@ -285,7 +285,7 @@ class LeftAndMain extends Controller { ); Requirements::combine_files( - 'assets/_leftandmain.js', + '_leftandmain.js', array( 'sapphire/thirdparty/scriptaculous/effects.js', 'sapphire/thirdparty/scriptaculous/dragdrop.js', @@ -298,7 +298,7 @@ class LeftAndMain extends Controller { ); Requirements::combine_files( - 'assets/_cmsmain.js', + '_cmsmain.js', array( 'cms/javascript/CMSMain_left.js', 'cms/javascript/CMSMain_right.js',