tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Removed Requirements:: static call and replace with instance (from r100533)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105598 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-05-25 04:16:33 +00:00
parent 3bab691afa
commit 656eccc7a4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Requirements.php
View File

@ -864,7 +864,7 @@ class Requirements_Backend {
function process_combined_files() { function process_combined_files() {
// The class_exists call prevents us from loading SapphireTest.php (slow) just to know that // The class_exists call prevents us from loading SapphireTest.php (slow) just to know that
// SapphireTest isn't running :-) // 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; else $runningTest = false;
if((Director::isDev() && !$runningTest) || !$this->combined_files_enabled) { if((Director::isDev() && !$runningTest) || !$this->combined_files_enabled) {
@ -929,7 +929,7 @@ class Requirements_Backend {
if(!$refresh) continue; if(!$refresh) continue;
$combinedData = ""; $combinedData = "";
foreach(array_diff($fileList,$this->blocked) as $file) { foreach(array_diff($fileList, $this->blocked) as $file) {
$fileContent = file_get_contents($base . $file); $fileContent = file_get_contents($base . $file);
// if we have a javascript file and jsmin is enabled, minify the content // if we have a javascript file and jsmin is enabled, minify the content
$isJS = stripos($file, '.js'); $isJS = stripos($file, '.js');

2
tests/forms/RequirementsTest.php
View File

@ -148,7 +148,7 @@ class RequirementsTest extends SapphireTest {
$backend->javascript(SAPPHIRE_DIR . '/tests/forms/RequirementsTest_a.js?test=1&test=2&test=3'); $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'); $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); $html = $backend->includeInHTML(false, self::$html_template);