Index: trunk/core/kernel/startup.php
===================================================================
diff -u -r2114 -r2311
--- trunk/core/kernel/startup.php	(.../startup.php)	(revision 2114)
+++ trunk/core/kernel/startup.php	(.../startup.php)	(revision 2311)
@@ -12,7 +12,9 @@
 	$_SERVER['DOCUMENT_ROOT'] = str_replace('\\', '/', str_replace($_SERVER['PATH_INFO'], '', FULL_PATH));
 }
 
-define('DOC_ROOT', rtrim(realpath($_SERVER['DOCUMENT_ROOT']), '/'));
+$doc_root = rtrim(realpath($_SERVER['DOCUMENT_ROOT']), '/');
+$doc_root = str_replace('\\', '/', $doc_root); // windows hack
+define('DOC_ROOT', $doc_root);
 
 include_once(KERNEL_PATH.'/globals.php');	// non OOP functions used through kernel, e.g. print_pre
 
Index: trunk/admin/install/upgrades/changelog_1_1_1.txt
===================================================================
diff -u -r2298 -r2311
--- trunk/admin/install/upgrades/changelog_1_1_1.txt	(.../changelog_1_1_1.txt)	(revision 2298)
+++ trunk/admin/install/upgrades/changelog_1_1_1.txt	(.../changelog_1_1_1.txt)	(revision 2311)
@@ -1,11 +1,14 @@
 File in-portal/.cvsignore changed
 File in-portal/globals.php changed
+File in-portal/admin/index.php changed
 File in-portal/admin/install.php changed
+File in-portal/admin/browse/checkboxes_new.js changed
 File in-portal/admin/category/images/Thumbs.db is removed
 File in-portal/admin/config/module_email.php changed
 File in-portal/admin/help/manual.pdf changed
 File in-portal/admin/images/toolbar/tool_primary_theme_f3.gif changed
 File in-portal/admin/import/step4.php changed
+File in-portal/admin/include/mainscript.php changed
 File in-portal/admin/install/inportal_data.sql changed
 File in-portal/admin/install/inportal_schema.sql changed
 File in-portal/admin/install/install_lib.php changed
@@ -25,17 +28,24 @@
 File in-portal/kernel/admin/include/navmenu.php changed
 File in-portal/kernel/admin/include/help/edituser_groups.txt changed
 File in-portal/kernel/admin/include/summary/root.php changed
+File in-portal/kernel/admin/include/toolbar/advanced_view.php changed
+File in-portal/kernel/admin/include/toolbar/browse.php changed
 File in-portal/kernel/admin_templates/category_selector.tpl is new
 File in-portal/kernel/admin_templates/img/my_orders_s.gif is removed
 File in-portal/kernel/admin_templates/img/itemicons/icon16_pricing.gif is new
 File in-portal/kernel/admin_templates/img/itemicons/icon16_pricing_primary.gif is new
 File in-portal/kernel/admin_templates/img/toolbar/icon16_pricing.gif is new
 File in-portal/kernel/admin_templates/img/toolbar/icon16_pricing_primary.gif is new
+File in-portal/kernel/admin_templates/img/toolbar/tool_new_page.gif is new
+File in-portal/kernel/admin_templates/img/toolbar/tool_new_page_f2.gif is new
 File in-portal/kernel/admin_templates/img/toolbar/tool_new_pricing.gif is new
 File in-portal/kernel/admin_templates/img/toolbar/tool_new_pricing_f2.gif is new
 File in-portal/kernel/admin_templates/img/toolbar/tool_primary_pricing.gif is new
 File in-portal/kernel/admin_templates/img/toolbar/tool_primary_pricing_f2.gif is new
 File in-portal/kernel/admin_templates/img/toolbar/tool_primary_pricing_f3.gif is new
+File in-portal/kernel/admin_templates/incs/blocks.tpl changed
+File in-portal/kernel/admin_templates/incs/grid_blocks.tpl changed
+File in-portal/kernel/admin_templates/incs/script.js changed
 File in-portal/kernel/admin_templates/regional/phrases_edit.tpl changed
 File in-portal/kernel/include/category.php changed
 File in-portal/kernel/include/config.php changed
@@ -84,6 +94,7 @@
 File kernel4_dev/kernel4/languages/phrases_cache.php changed
 File kernel4_dev/kernel4/parser/tags.php changed
 File kernel4_dev/kernel4/processors/main_processor.php changed
+File kernel4_dev/kernel4/session/session.php changed
 File kernel4_dev/kernel4/utility/debugger.php changed
 File kernel4_dev/kernel4/utility/email.php changed
 File kernel4_dev/kernel4/utility/formatters.php changed