Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -N -r7391 -r7413
--- trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 7391)
+++ trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 7413)
@@ -788,7 +788,7 @@
 			$rs = $this->adodbConnection->Execute($sql);
 			
 			$PermList = Array();
-			while (!$rs->EOF) {
+			while ($rs && !$rs->EOF) {
 				$this->SysPermCache[ $rs->fields['Permission'] ] = $rs->fields['PermissionValue'];
 				$PermList[] = $rs->fields['Permission'];
 				$rs->MoveNext();
Index: trunk/admin/install/install_lib.php
===================================================================
diff -u -N -r7391 -r7413
--- trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 7391)
+++ trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 7413)
@@ -324,6 +324,7 @@
 		$sqls = str_replace($replace_from, $replace_to, $sqls);
 	}
 
+	$sqls = str_replace("\r\n", "\n", $sqls);
 	$sqls = explode(";\n", $sqls);
 
 	foreach ($sqls as $sql) {
Index: trunk/core/admin_templates/js/catalog.js
===================================================================
diff -u -N -r6669 -r7413
--- trunk/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 6669)
+++ trunk/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 7413)
@@ -68,7 +68,9 @@
 };
 
 Catalog.prototype.successCallback = function($request, $params, $object) {
+	
 	var $text = $request.responseText;
+	
 	var $match_redirect = new RegExp('^#redirect#(.*)').exec($text);
 	if ($match_redirect != null) {
 		// redirect to external template requested
@@ -77,13 +79,14 @@
 	}
 
 	$params = $params.split(',');
+	
 
-
 	var $js_end = $text.indexOf($object.Separator);
-//	alert($text.substring(0, $js_end));
 	if ($js_end != -1) {
+		
 		// allow to detect if output is permitted by ajax request parameters
 		var $request_visible = '$request_visible = ' + ($params[0].length ? 'true' : 'false') + "\n";
+		
 		if ($params[0].length) {
 			document.getElementById($params[0]).innerHTML = $text.substring($js_end + $object.Separator.length);
 			eval($request_visible + $text.substring(0, $js_end));
@@ -93,6 +96,7 @@
 			eval($request_visible + $text.substring(0, $js_end));
 		}
 	}
+
 	else if ($params[0].length) {
 		document.getElementById($params[0]).innerHTML = $text;
 	}
Index: trunk/kernel/admin_templates/incs/catalog.js
===================================================================
diff -u -N -r6669 -r7413
--- trunk/kernel/admin_templates/incs/catalog.js	(.../catalog.js)	(revision 6669)
+++ trunk/kernel/admin_templates/incs/catalog.js	(.../catalog.js)	(revision 7413)
@@ -68,7 +68,9 @@
 };
 
 Catalog.prototype.successCallback = function($request, $params, $object) {
+	
 	var $text = $request.responseText;
+	
 	var $match_redirect = new RegExp('^#redirect#(.*)').exec($text);
 	if ($match_redirect != null) {
 		// redirect to external template requested
@@ -77,13 +79,14 @@
 	}
 
 	$params = $params.split(',');
+	
 
-
 	var $js_end = $text.indexOf($object.Separator);
-//	alert($text.substring(0, $js_end));
 	if ($js_end != -1) {
+		
 		// allow to detect if output is permitted by ajax request parameters
 		var $request_visible = '$request_visible = ' + ($params[0].length ? 'true' : 'false') + "\n";
+		
 		if ($params[0].length) {
 			document.getElementById($params[0]).innerHTML = $text.substring($js_end + $object.Separator.length);
 			eval($request_visible + $text.substring(0, $js_end));
@@ -93,6 +96,7 @@
 			eval($request_visible + $text.substring(0, $js_end));
 		}
 	}
+
 	else if ($params[0].length) {
 		document.getElementById($params[0]).innerHTML = $text;
 	}
Index: trunk/kernel/include/theme.php
===================================================================
diff -u -N -r4902 -r7413
--- trunk/kernel/include/theme.php	(.../theme.php)	(revision 4902)
+++ trunk/kernel/include/theme.php	(.../theme.php)	(revision 7413)
@@ -750,7 +750,7 @@
 		// make stylesheet/theme hash
 		$css_hash = Array();
 		$css_rs = $this->adodbConnection->Execute('SELECT Name, StylesheetId FROM '.GetTablePrefix().'Stylesheets'); 
-		while(!$css_rs->EOF)
+		while($css_rs && !$css_rs->EOF)
 		{
 			$css_hash[ strtolower($css_rs->fields['Name']) ] = $css_rs->fields['StylesheetId'];
 			$css_rs->MoveNext();