From 656eccc7a4cf71147386393583c862a108a19724 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 25 May 2010 04:16:33 +0000 Subject: [PATCH] MINOR Removed Requirements:: static call and replace with instance (from r100533) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105598 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Requirements.php | 4 ++-- tests/forms/RequirementsTest.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Requirements.php b/core/Requirements.php index 2480318a8..9254f09eb 100644 --- a/core/Requirements.php +++ b/core/Requirements.php @@ -864,7 +864,7 @@ class Requirements_Backend { function process_combined_files() { // The class_exists call prevents us from loading SapphireTest.php (slow) just to know that // SapphireTest isn't running :-) - if(class_exists('SapphireTest',false)) $runningTest = SapphireTest::is_running_test(); + if(class_exists('SapphireTest', false)) $runningTest = SapphireTest::is_running_test(); else $runningTest = false; if((Director::isDev() && !$runningTest) || !$this->combined_files_enabled) { @@ -929,7 +929,7 @@ class Requirements_Backend { if(!$refresh) continue; $combinedData = ""; - foreach(array_diff($fileList,$this->blocked) as $file) { + foreach(array_diff($fileList, $this->blocked) as $file) { $fileContent = file_get_contents($base . $file); // if we have a javascript file and jsmin is enabled, minify the content $isJS = stripos($file, '.js'); diff --git a/tests/forms/RequirementsTest.php b/tests/forms/RequirementsTest.php index 7ff153d34..1f50e1151 100644 --- a/tests/forms/RequirementsTest.php +++ b/tests/forms/RequirementsTest.php @@ -148,7 +148,7 @@ class RequirementsTest extends SapphireTest { $backend->javascript(SAPPHIRE_DIR . '/tests/forms/RequirementsTest_a.js?test=1&test=2&test=3'); $backend->css(SAPPHIRE_DIR . '/tests/forms/RequirementsTest_a.css?test=1&test=2&test=3'); - Requirements::delete_combined_files('RequirementsTest_bc.js'); + $backend->delete_combined_files('RequirementsTest_bc.js'); $html = $backend->includeInHTML(false, self::$html_template);