Index: branches/unlabeled/unlabeled-1.43.2/admin/install/install_lib.php
===================================================================
diff -u -r6015 -r6038
--- branches/unlabeled/unlabeled-1.43.2/admin/install/install_lib.php	(.../install_lib.php)	(revision 6015)
+++ branches/unlabeled/unlabeled-1.43.2/admin/install/install_lib.php	(.../install_lib.php)	(revision 6038)
@@ -1055,12 +1055,13 @@
 
 		$current_item_tpls = $application->Conn->Query(
 				'SELECT ResourceId, ItemTemplate FROM '.TABLE_PREFIX.'Category
-				 WHERE ParentPath LIKE "'.$root_parent_path.'%"');
+				 WHERE ParentPath LIKE "'.$root_parent_path.'%" AND ItemTemplate != "" AND ItemTemplate IS NOT NULL');
 
 		foreach ($current_item_tpls as $a_cat) {
 			$query = 'UPDATE '.TABLE_PREFIX.'CategoryCustomData
 								SET '.$item_t_customfield.' = '.$application->Conn->qstr($a_cat['ItemTemplate']).'
 								WHERE ResourceId = '.$a_cat['ResourceId'];
+			$application->Conn->Query($query);
 		}
 
 	}
Index: branches/unlabeled/unlabeled-1.106.2/admin/install.php
===================================================================
diff -u -r6015 -r6038
--- branches/unlabeled/unlabeled-1.106.2/admin/install.php	(.../install.php)	(revision 6015)
+++ branches/unlabeled/unlabeled-1.106.2/admin/install.php	(.../install.php)	(revision 6038)
@@ -603,7 +603,7 @@
 	    	$rs->MoveNext();
 	    }
 
-	    $sql = 'DELETE FROM '.$g_TablePrefix.'Cache WHERE VarName IN ("config_files","configs_parsed")';
+	    $sql = 'DELETE FROM '.$g_TablePrefix.'Cache WHERE VarName IN ("config_files","configs_parsed","sections_parsed")';
 		$ado->Execute($sql);
 
 		$include_file = $pathtoroot.$admin."/install/upgrade.php";
Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_2_1.txt
===================================================================
diff -u -r6031 -r6038
--- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_2_1.txt	(.../changelog_1_2_1.txt)	(revision 6031)
+++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_2_1.txt	(.../changelog_1_2_1.txt)	(revision 6038)
@@ -23,7 +23,7 @@
 File in-portal/admin/install/install_lib.php changed
 File in-portal/admin/install/restore_run.php changed
 File in-portal/admin/install/langpacks/english.lang changed
-File in-portal/admin/install/upgrades/changelog_1_2_1.txt is new; release_1_2_1 revision 1.1.2.1
+File in-portal/admin/install/upgrades/changelog_1_2_1.txt is new; release_1_2_1 revision 1.1.2.2
 File in-portal/admin/install/upgrades/inportal_upgrade_v1.2.1.php is new; release_1_2_1 revision 1.4.2.2
 File in-portal/admin/install/upgrades/inportal_upgrade_v1.2.1.sql is new; release_1_2_1 revision 1.8.2.3
 File in-portal/admin/modules/addmodule.php changed