Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 696)
+++ trunk/CHANGELOG	(revision 697)
@@ -10,7 +10,9 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.0 -------------------------------------
+------------------------------------- 2.7.0 -------------------------------------
+13-Feb-2008 Thomas Hornik
+#	fixed an highlighting-issue: highlighting a page with more than one sections mangled umlauts in the second to last section.
 10-Feb-2008 Matthias Gallas
 #	fixed some errors in standard german language file
 +	added new colloquially german language file (thanks to Michael Tenschert)
Index: trunk/wb/framework/frontend.functions.php
===================================================================
--- trunk/wb/framework/frontend.functions.php	(revision 696)
+++ trunk/wb/framework/frontend.functions.php	(revision 697)
@@ -70,8 +70,9 @@
 if (!function_exists('search_highlight')) {
 function search_highlight($foo='', $arr_string=array()) {
 	require_once(WB_PATH.'/framework/functions.php');
-	require_once(WB_PATH.'/search/search_convert.php');
-
+	static $string_ul_umlauts=array();
+	if($string_ul_umlauts == array())
+		require(WB_PATH.'/search/search_convert.php');
 	$foo = entities_to_umlauts($foo, 'UTF-8');
 	array_walk($arr_string, create_function('&$v,$k','$v = preg_quote($v, \'/\');'));
 	$search_string = implode("|", $arr_string);