Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 630)
+++ trunk/CHANGELOG	(revision 631)
@@ -15,7 +15,8 @@
 !	added possibility to select the default backend language during installation process
 !	Re-introduced Changeset 593 (filename in pages/ from page_title instead of menu_title)
 #	Fixed some bugs in the Javascript Admin modul
-28-Jan-2008 Thomas Hornik
+28-Jan-2008 Thomas Hornik
+!	changeset 627: menu_link and search/search.php needs some minor changes, too.
 +	Added Text-CAPTCHA on request. The captcha-text will be stored in temp/.captcha_text.txt
 27-Jan-2008 Christian Sommer
 !	fixed CSS background color of the installer CSS
Index: trunk/wb/search/search.php
===================================================================
--- trunk/wb/search/search.php	(revision 630)
+++ trunk/wb/search/search.php	(revision 631)
@@ -337,8 +337,8 @@
 					'database' => $database,
 					'page_id' => $res['page_id'],
 					'section_id' => $res['section_id'],
-					'page_title' => $res['page_title'],
-					'page_menu_title' => $res['menu_title'],
+					'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_description' => ($cfg_show_description?$res['description']:""),
 					'page_keywords' => $res['keywords'],
 					'page_link' => $res['link'],
@@ -390,8 +390,8 @@
 			$func_vars = array(
 				'database' => $database,
 				'page_id' => $page['page_id'],
-				'page_title' => $page['page_title'],
-				'page_menu_title' => $page['menu_title'],
+				'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_description' => ($cfg_show_description?$page['description']:""),
 				'page_keywords' => $page['keywords'],
 				'page_link' => $page['link'],
@@ -605,7 +605,9 @@
 						if($cfg_show_description == 0) {
 							$page['description'] = "";
 						}
-						$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);
+						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);
 						// 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 630)
+++ trunk/wb/modules/menu_link/modify.php	(revision 631)
@@ -41,7 +41,7 @@
 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['page_title'];
+			$links[$page['page_id']]='/'.$page['menu_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)) {