Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MINOR: add flag for combine in order to test Requirements::combine_fi…

…les() while in dev
  • Loading branch information...
commit 168663657be28b7a7a71b237c2cd55842ad90122 1 parent 8b98b44
Will Rossiter wilr authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  view/Requirements.php
2  view/Requirements.php
View
@@ -945,7 +945,7 @@ function process_combined_files() {
if(class_exists('SapphireTest', false)) $runningTest = SapphireTest::is_running_test();
else $runningTest = false;
- if((Director::isDev() && !$runningTest) || !$this->combined_files_enabled) {
+ if((Director::isDev() && !$runningTest && !isset($_REQUEST['combine'])) || !$this->combined_files_enabled) {
return;
}
Please sign in to comment.
Something went wrong with that request. Please try again.