Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 592)
+++ trunk/CHANGELOG	(revision 593)
@@ -10,7 +10,9 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.0 -------------------------------------
+------------------------------------- 2.7.0 -------------------------------------
+24-Jan-2008 Thomas Hornik
+!	Generate filename in pages/ from page_title instead of menu_title.
 24-Jan-2008 Christian Sommer
 #	fixed bug in Codepress integration (if codepress framework not installed)
 +	added language support to all integrated modules (except for news and form module)
Index: trunk/wb/upgrade-script.php
===================================================================
--- trunk/wb/upgrade-script.php	(revision 592)
+++ trunk/wb/upgrade-script.php	(revision 593)
@@ -349,6 +349,13 @@
 	
 }
 
+// some code missing to regenerate page_title from link/filename
+// for_all_pages: if filename($page_title) != basename($link) {
+//   rename $page_title to basename($link)
+// }
+// This must be done after menu_link-upgrade
+// 
+// Should we really do this? - must be checked
 
 
 //******************************************************************************
Index: trunk/wb/admin/pages/settings2.php
===================================================================
--- trunk/wb/admin/pages/settings2.php	(revision 592)
+++ trunk/wb/admin/pages/settings2.php	(revision 593)
@@ -122,8 +122,8 @@
 
 // Work-out what the link should be
 if($parent == '0') {
-	$link = '/'.page_filename($menu_title);
-	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).PAGE_EXTENSION; 
+	$link = '/'.page_filename($page_title);
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($page_title).PAGE_EXTENSION; 
 } else {
 	$parent_section = '';
 	$parent_titles = array_reverse(get_parent_titles($parent));
@@ -131,8 +131,8 @@
 		$parent_section .= page_filename($parent_title).'/';
 	}
 	if($parent_section == '/') { $parent_section = ''; }
-	$link = '/'.$parent_section.page_filename($menu_title);
-	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).PAGE_EXTENSION;  
+	$link = '/'.$parent_section.page_filename($page_title);
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($page_title).PAGE_EXTENSION;  
 }
 
 // Check if a page with same page filename exists
Index: trunk/wb/framework/functions.php
===================================================================
--- trunk/wb/framework/functions.php	(revision 592)
+++ trunk/wb/framework/functions.php	(revision 593)
@@ -709,7 +709,7 @@
 			$admin->print_error($MESSAGE['PAGES']['CANNOT_DELETE_ACCESS_FILE']);
 		} else {
 			unlink($filename);
-			if(file_exists($directory) && rtrim($directory,'/')!=WB_PATH.PAGES_DIRECTORY) {
+			if(file_exists($directory) && rtrim($directory,'/')!=WB_PATH.PAGES_DIRECTORY && substr($link, 0, 1) != '.') {
 				rm_full_dir($directory);
 			}
 		}
Index: trunk/wb/modules/menu_link/modify.php
===================================================================
--- trunk/wb/modules/menu_link/modify.php	(revision 592)
+++ trunk/wb/modules/menu_link/modify.php	(revision 593)
@@ -41,12 +41,12 @@
 if($query_page = $database->query("SELECT DISTINCT p.* FROM $table_p AS p INNER JOIN $table_s AS s ON p.page_id=s.page_id WHERE s.module != 'menu_link' AND p.page_id != '$page_id' AND parent = '0' ORDER BY position")) {
 	while($page = $query_page->fetchRow()) {
 		if($admin->page_is_visible($page)) {
-			$links[$page['page_id']]='/'.$page['menu_title'];
+			$links[$page['page_id']]='/'.$page['page_title'];
 			if($query_subpage = $database->query("SELECT DISTINCT p.* FROM $table_p AS p INNER JOIN $table_s AS s ON p.page_id=s.page_id WHERE s.module != 'menu_link' AND p.page_id != '$page_id' AND root_parent = '{$page['page_id']}' ORDER BY level")) {
 				while($sub = $query_subpage->fetchRow()) {
 					if($admin->page_is_visible($sub)) {
 						$parent_link = (array_key_exists($sub['parent'],$links))?$links[$sub['parent']]:"";
-						$links[$sub['page_id']]=$parent_link.'/'.$sub['menu_title'];
+						$links[$sub['page_id']]=$parent_link.'/'.$sub['page_title'];
 					}
 				}
 			}