Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 829)
+++ trunk/CHANGELOG	(revision 830)
@@ -10,7 +10,9 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.0 -------------------------------------
+------------------------------------- 2.7.0 -------------------------------------
+15-Apr-2008 Thomas Hornik
+!	revert back to pagename-creation from $page_menu, instead of $page_title
 15-Apr-2008 Christian Sommer
 #	fixed bug introduced with Changeset 826
 14-Apr-2008 Christian Sommer
Index: trunk/wb/admin/pages/settings2.php
===================================================================
--- trunk/wb/admin/pages/settings2.php	(revision 829)
+++ trunk/wb/admin/pages/settings2.php	(revision 830)
@@ -122,8 +122,8 @@
 
 // Work-out what the link should be
 if($parent == '0') {
-	$link = '/'.page_filename($page_title);
-	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($page_title).PAGE_EXTENSION; 
+	$link = '/'.page_filename($menu_title);
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_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($page_title);
-	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($page_title).PAGE_EXTENSION;  
+	$link = '/'.$parent_section.page_filename($menu_title);
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).PAGE_EXTENSION;  
 }
 
 // Check if a page with same page filename exists
Index: trunk/wb/search/search.php
===================================================================
--- trunk/wb/search/search.php	(revision 829)
+++ trunk/wb/search/search.php	(revision 830)
@@ -360,8 +360,8 @@
 					'database' => $database,
 					'page_id' => $res['page_id'],
 					'section_id' => $res['section_id'],
-					'page_title' => $res['menu_title'], // had to change this, since the link is build from page_title (changeset #593)
-					'page_menu_title' => $res['page_title'],
+					'page_title' => $res['page_title'],
+					'page_menu_title' => $res['menu_title'],
 					'page_description' => ($cfg_show_description?$res['description']:""),
 					'page_keywords' => $res['keywords'],
 					'page_link' => $res['link'],
@@ -438,8 +438,8 @@
 			$func_vars = array(
 				'database' => $database,
 				'page_id' => $page['page_id'],
-				'page_title' => $page['menu_title'], // had to change this, since the link is build from page_title (changeset #593)
-				'page_menu_title' => $page['page_title'],
+				'page_title' => $page['page_title'],
+				'page_menu_title' => $page['menu_title'],
 				'page_description' => ($cfg_show_description?$page['description']:""),
 				'page_keywords' => $page['keywords'],
 				'page_link' => $page['link'],
@@ -651,9 +651,7 @@
 						if($cfg_show_description == 0) {
 							$page['description'] = "";
 						}
-						if(isset($page['menu_title'])) $rep_title = $page['menu_title'];
-						else $rep_title = $page['page_title'];
-						$values = array($link, $rep_title, $page['description'], $users[$page['modified_by']]['username'], $users[$page['modified_by']]['display_name'], $date, $time, $TEXT['LAST_UPDATED_BY'], strtolower($TEXT['ON']), $excerpt);
+						$values = array($link, $page['page_title'], $page['description'], $users[$page['modified_by']]['username'], $users[$page['modified_by']]['display_name'], $date, $time, $TEXT['LAST_UPDATED_BY'], strtolower($TEXT['ON']), $excerpt);
 						// Show loop code with vars replaced by values
 						echo str_replace($vars, $values, ($fetch_results_loop['value']));
 						// Say that this page has been listed
Index: trunk/wb/modules/menu_link/modify.php
===================================================================
--- trunk/wb/modules/menu_link/modify.php	(revision 829)
+++ trunk/wb/modules/menu_link/modify.php	(revision 830)
@@ -57,7 +57,7 @@
 			while($sub = $query_subpage->fetchRow()) {
 				if($admin->page_is_visible($sub)) {
 					$parent_link = (array_key_exists($sub['parent'],$all_links))?$all_links[$sub['parent']]:"";
-					$links[$sub['page_id']]=$parent_link.'/'.$sub['page_title'];
+					$links[$sub['page_id']]=$parent_link.'/'.$sub['menu_title'];
 				}
 			}
 		}