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

BUGFIX Fix errors if empty array passed for vars in Requirements_Backend::javascriptTemplate()

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71905 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-02-16 21:08:54 +00:00
parent 0b9db33164
commit 5012fcb3ca
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Requirements.php
View File

@ -427,10 +427,14 @@ class Requirements_Backend {
*/ */
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) { $search = array();
$replace = array();
if($vars) foreach($vars as $k => $v) {
$search[] = '$' . $k; $search[] = '$' . $k;
$replace[] = str_replace("\\'","'", Convert::raw2js($v)); $replace[] = str_replace("\\'","'", Convert::raw2js($v));
} }
$script = str_replace($search, $replace, $script); $script = str_replace($search, $replace, $script);
$this->customScript($script, $uniquenessID); $this->customScript($script, $uniquenessID);
} }