mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Bugfixes to Requirements alterations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65438 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
cbbedab5a2
commit
429f81ed14
@ -398,7 +398,7 @@ class Requirements_Backend {
|
||||
* @param file The template file to load.
|
||||
* @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));
|
||||
foreach($vars as $k => $v) {
|
||||
$search[] = '$' . $k;
|
||||
@ -422,7 +422,7 @@ class Requirements_Backend {
|
||||
}
|
||||
|
||||
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 = "";
|
||||
|
||||
if($this->customScript) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user