Skip to content
This repository
Browse code

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 authored June 29, 2012

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. 2  view/Requirements.php
2  view/Requirements.php
@@ -945,7 +945,7 @@ function process_combined_files() {
945 945
 		if(class_exists('SapphireTest', false)) $runningTest = SapphireTest::is_running_test();
946 946
 		else $runningTest = false;
947 947
 		
948  
-		if((Director::isDev() && !$runningTest) || !$this->combined_files_enabled) {
  948
+		if((Director::isDev() && !$runningTest && !isset($_REQUEST['combine'])) || !$this->combined_files_enabled) {
949 949
 			return;
950 950
 		}
951 951
 		

0 notes on commit 1686636

Please sign in to comment.
Something went wrong with that request. Please try again.