diff options
| author | wei <> | 2007-04-20 04:38:32 +0000 |
|---|---|---|
| committer | wei <> | 2007-04-20 04:38:32 +0000 |
| commit | 411c988c5b8d5de72a325e2c8cc6a23f0cc335e8 (patch) | |
| tree | 9165e41cde9829720a29e25f84b00ba459b22522 /framework/Web/Javascripts | |
| parent | 9ebc3a5817f47ece534fea71d6b10a08411ee4be (diff) | |
Fixed #606, #605, and javascript problems with combining multiple js files under linux.
Diffstat (limited to 'framework/Web/Javascripts')
| -rw-r--r-- | framework/Web/Javascripts/clientscripts.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/Web/Javascripts/clientscripts.php b/framework/Web/Javascripts/clientscripts.php index f810901b..1070a8d0 100644 --- a/framework/Web/Javascripts/clientscripts.php +++ b/framework/Web/Javascripts/clientscripts.php @@ -124,7 +124,7 @@ function combine_javascript($files) {
$filename = $base.'/'.$file;
if(is_file($filename)) //relies on get_client_script_files() for security
- $content .= file_get_contents($filename);
+ $content .= "\x0D\x0A".file_get_contents($filename); //add CR+LF
else
error_log('Prado client script: missing file '.$filename);
}
|