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

Bugfixes to Requirements alterations

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65438 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-11-07 02:24:31 +00:00
parent cbbedab5a2
commit 429f81ed14
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Requirements.php
View File

@ -398,7 +398,7 @@ class Requirements_Backend {
* @param file The template file to load. * @param file The template file to load.
* @param vars The array of variables to load. These variables are loaded via string search & replace. * @param vars The array of variables to load. These variables are loaded via string search & replace.
*/ */
static function javascriptTemplate($file, $vars, $uniquenessID = null) { function javascriptTemplate($file, $vars, $uniquenessID = null) {
$script = file_get_contents(Director::getAbsFile($file)); $script = file_get_contents(Director::getAbsFile($file));
foreach($vars as $k => $v) { foreach($vars as $k => $v) {
$search[] = '$' . $k; $search[] = '$' . $k;
@ -422,7 +422,7 @@ class Requirements_Backend {
} }
function get_css() { function get_css() {
return array_diff_key($this->css,$this->blocked)); return array_diff_key($this->css,$this->blocked);
} }
/** /**
@ -810,7 +810,7 @@ class Requirements_Backend {
} }
} }
static function get_custom_scripts() { function get_custom_scripts() {
$requirements = ""; $requirements = "";
if($this->customScript) { if($this->customScript) {