Index: /FCKpackager/trunk/_dev/gensinglefile.php
===================================================================
--- /FCKpackager/trunk/_dev/gensinglefile.php	(revision 2077)
+++ /FCKpackager/trunk/_dev/gensinglefile.php	(revision 2078)
@@ -3,5 +3,5 @@
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
Index: /FCKpackager/trunk/_samples/fckeditor/_source/internals/fckxhtmlentities.js
===================================================================
--- /FCKpackager/trunk/_samples/fckeditor/_source/internals/fckxhtmlentities.js	(revision 2077)
+++ /FCKpackager/trunk/_samples/fckeditor/_source/internals/fckxhtmlentities.js	(revision 2078)
@@ -1,5 +1,5 @@
 ﻿/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
Index: /FCKpackager/trunk/_source/fckpackager.php
===================================================================
--- /FCKpackager/trunk/_source/fckpackager.php	(revision 2077)
+++ /FCKpackager/trunk/_source/fckpackager.php	(revision 2078)
@@ -3,5 +3,5 @@
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
@@ -28,5 +28,5 @@
 echo( "\n" ) ;
 echo( 'FCKpackager - JavaScript Packager and Compressor - Version 1.0' . "\n" ) ;
-echo( 'Copyright 2004-2007 Frederico Caldeira Knabben - All rights reserved' . "\n" ) ;
+echo( 'Copyright 2004-2008 Frederico Caldeira Knabben - All rights reserved' . "\n" ) ;
 echo( "\n" ) ;
 
Index: /FCKpackager/trunk/_source/includes/common.inc
===================================================================
--- /FCKpackager/trunk/_source/includes/common.inc	(revision 2077)
+++ /FCKpackager/trunk/_source/includes/common.inc	(revision 2078)
@@ -2,5 +2,5 @@
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
Index: /FCKpackager/trunk/_source/includes/fckcontantprocessor.inc
===================================================================
--- /FCKpackager/trunk/_source/includes/fckcontantprocessor.inc	(revision 2077)
+++ /FCKpackager/trunk/_source/includes/fckcontantprocessor.inc	(revision 2078)
@@ -2,5 +2,5 @@
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
Index: /FCKpackager/trunk/_source/includes/fckfunctionprocessor.inc
===================================================================
--- /FCKpackager/trunk/_source/includes/fckfunctionprocessor.inc	(revision 2077)
+++ /FCKpackager/trunk/_source/includes/fckfunctionprocessor.inc	(revision 2078)
@@ -2,5 +2,5 @@
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
Index: /FCKpackager/trunk/_source/includes/fckjavascriptcompressor.inc
===================================================================
--- /FCKpackager/trunk/_source/includes/fckjavascriptcompressor.inc	(revision 2077)
+++ /FCKpackager/trunk/_source/includes/fckjavascriptcompressor.inc	(revision 2078)
@@ -2,5 +2,5 @@
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
Index: /FCKpackager/trunk/_source/includes/fckpackagefile.inc
===================================================================
--- /FCKpackager/trunk/_source/includes/fckpackagefile.inc	(revision 2077)
+++ /FCKpackager/trunk/_source/includes/fckpackagefile.inc	(revision 2078)
@@ -2,5 +2,5 @@
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
Index: /FCKpackager/trunk/_source/includes/fckpackager.inc
===================================================================
--- /FCKpackager/trunk/_source/includes/fckpackager.inc	(revision 2077)
+++ /FCKpackager/trunk/_source/includes/fckpackager.inc	(revision 2078)
@@ -2,5 +2,5 @@
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
Index: /FCKpackager/trunk/_source/includes/fckstringsprocessor.inc
===================================================================
--- /FCKpackager/trunk/_source/includes/fckstringsprocessor.inc	(revision 2077)
+++ /FCKpackager/trunk/_source/includes/fckstringsprocessor.inc	(revision 2078)
@@ -2,5 +2,5 @@
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
Index: /FCKpackager/trunk/_source/includes/fckxmldocument.inc
===================================================================
--- /FCKpackager/trunk/_source/includes/fckxmldocument.inc	(revision 2077)
+++ /FCKpackager/trunk/_source/includes/fckxmldocument.inc	(revision 2078)
@@ -2,5 +2,5 @@
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
Index: /FCKpackager/trunk/fckpackager.php
===================================================================
--- /FCKpackager/trunk/fckpackager.php	(revision 2077)
+++ /FCKpackager/trunk/fckpackager.php	(revision 2078)
@@ -48,5 +48,5 @@
 ?>
 
-<?php
+﻿<?php
 
 
@@ -59,5 +59,5 @@
 function StrEndsWith( $str, $sub )
 {
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ;
+	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ;
 }
 
@@ -72,19 +72,14 @@
 function CreateDir($path, $rights = 0777)
 {
-	$folder_path = array(
-		strstr( $path, '.' ) ? dirname( $path ) : $path ) ;
-
-	while ( !@is_dir( dirname( end( $folder_path ) ) )
-			&& dirname( end( $folder_path ) ) != '/'
-			&& dirname( end( $folder_path ) ) != '.'
-			&& dirname( end( $folder_path ) ) != '' )
-	{
-		$folder_path[] = dirname( end( $folder_path ) ) ;
-	}
-
-	while ( $parent_folder_path = array_pop( $folder_path ) )
-	{
-		if ( !@mkdir( $parent_folder_path, $rights ) )
-			ExitError( "Can't create folder \"$parent_folder_path\"." ) ;
+	$dirParts = explode( '/', $path ) ;
+
+	$currentDir = '' ;
+
+	foreach ( $dirParts as $dirPart )
+	{
+		$currentDir .= $dirPart . '/' ;
+
+		if ( strlen( $dirPart ) > 0 && !is_dir( $currentDir ) )
+			mkdir( $currentDir, $rights ) ;
 	}
 }
@@ -100,22 +95,5 @@
 		fwrite( $f, "\xEF\xBB\xBF" ) ;	// BOM
 
-	fwrite( $f, $strData ) ;
-	fclose( $f ) ;
-
-	return TRUE ;
-}
-
-function SaveStringToUtf8File( $strData, $filePath, $includeBom = TRUE )
-{
-	$f = @fopen( $filePath, 'wb' ) ;
-
-	if ( !$f )
-		return FALSE ;
-
-	if ( $includeBom )
-		fwrite( $f, "\xEF\xBB\xBF" ) ;	// BOM
-
-	fwrite( $f, ( $strData ) ) ;
-
+	fwrite( $f, StripUtf8Bom( $strData ) ) ;
 	fclose( $f ) ;
 
@@ -359,7 +337,9 @@
 			' ', $script ) ;
 
-		// Concatenate lines that end with "}" using a ";" (except for "else" and "catch" cases).
-		$script = preg_replace(
-			'/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|}))/s',
+		// Concatenate lines that end with "}" using a ";", except for "else",
+		// "while", "catch" and "finally" cases, or when followed by, "'", ";",
+		// "}" or ")".
+		$script = preg_replace(
+			'/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|finally|while|[}\),;]))/s',
 			'};', $script ) ;
 
@@ -669,8 +649,8 @@
 	function ProcessFile( $sourceFilePath, $destinationFilePath, $onlyHeader = FALSE )
 	{
-		SaveStringToUtf8File(
+		SaveStringToFile(
 			FCKPreProcessor::Process( file_get_contents( $sourceFilePath ), $onlyHeader ),
 			$destinationFilePath,
-			( !StrEndsWith( $sourceFilePath, '.asp' ) && !StrEndsWith( $sourceFilePath, '.js' ) ) ) ;	// Only ASP and JavaScript files require the BOM.
+			( StrEndsWith( $sourceFilePath, '.asp' ) || StrEndsWith( $sourceFilePath, '.js' ) ) ) ;	// Only ASP and JavaScript files require the BOM.
 
 		// Set the destination file Last Access and Last Write times.
