From 411c988c5b8d5de72a325e2c8cc6a23f0cc335e8 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 20 Apr 2007 04:38:32 +0000
Subject: Fixed #606, #605, and javascript problems with combining multiple js
 files under linux.

---
 framework/Web/Javascripts/clientscripts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'framework/Web/Javascripts')

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);
 	}
-- 
cgit v1.2.3