Permalink
Browse files

MINOR LeftAndMain combined files don't need to be prefixed with "asse…

…ts" 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
  • Loading branch information...
1 parent 00a5a5b commit f04470ddf03f53d9e4b3c81514f154824b2ace86 @sminnee sminnee committed Oct 4, 2010
Showing with 3 additions and 3 deletions.
  1. +3 −3 code/LeftAndMain.php
View
@@ -271,7 +271,7 @@ function init() {
// 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 @@ function init() {
);
Requirements::combine_files(
- 'assets/_leftandmain.js',
+ '_leftandmain.js',
array(
'sapphire/thirdparty/scriptaculous/effects.js',
'sapphire/thirdparty/scriptaculous/dragdrop.js',
@@ -298,7 +298,7 @@ function init() {
);
Requirements::combine_files(
- 'assets/_cmsmain.js',
+ '_cmsmain.js',
array(
'cms/javascript/CMSMain_left.js',
'cms/javascript/CMSMain_right.js',

0 comments on commit f04470d

Please sign in to comment.