Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 667)
+++ trunk/CHANGELOG	(revision 668)
@@ -10,7 +10,9 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.0 -------------------------------------
+------------------------------------- 2.7.0 -------------------------------------
+04-Feb-2008 Thomas Hornik
+!	email-addresses are excluded from search-results page.
 04-Feb-2008 Christian Sommer
 #	allowed usage of tags in settings fields: website_header, website_footer
 03-Feb-2008 Thomas Hornik
@@ -21,7 +23,7 @@
 02-Feb-2008 Christian Sommer
 #	fixed wrong redirect in /admin/images
 02-Feb-2008 Thomas Hornik
-!	search will show email-addresses, even if email-filter is activated (on page with highlighting). Fixed.
+!	search shows email-addresses, even if email-filter is activated (on page with highlighting). Fixed.
 +	Added missing text in languages files for jscalendar
 !	settings: pages-directory '/' will be converted to '' (empty string) on save.
 !	changed last remaining call to my_htmlspecialchars() to htmlspecialchars()
Index: trunk/wb/search/search_modext.php
===================================================================
--- trunk/wb/search/search_modext.php	(revision 667)
+++ trunk/wb/search/search_modext.php	(revision 668)
@@ -235,6 +235,8 @@
 	// prepare the text (part 1): remove lf and cr, convert \" to ", remove comments, style, scripting and unnecessary whitespace, convert to utf8
 	$mod_text = strtr($mod_text, array("\x0D\x0A" => ' ', "\x0D" => ' ', "\x0A" => ' ', '\"' => '"'));
 	$mod_text = preg_replace('/(<!--.*?-->|<style.*?<\/style>|<script.*?<\/script>|\s+)/i', ' ', $mod_text);
+	// remove email-addresses
+	$mod_text = preg_replace('/\b[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}\b/', ' ', $mod_text);
 	$mod_text = entities_to_umlauts($mod_text, 'UTF-8');
 
 	// make the link from $mod_page_link, add target