Skip to content

Commit

Permalink
MINOR: add flag for combine in order to test Requirements::combine_fi…
Browse files Browse the repository at this point in the history
…les() while in dev
  • Loading branch information
wilr committed Jun 29, 2012
1 parent 8b98b44 commit 1686636
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion view/Requirements.php
Expand Up @@ -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;
}

Expand Down

0 comments on commit 1686636

Please sign in to comment.