Index: trunk/wb/framework/functions.php
===================================================================
--- trunk/wb/framework/functions.php	(revision 640)
+++ trunk/wb/framework/functions.php	(revision 641)
@@ -355,10 +355,6 @@
 	static $utf8_ok=0;
 	if($utf8_ok == 0) {
 		++$utf8_ok;
-		// debug XXX to be removed
-		if($utf8_ok > 1)
-			trigger_error("init_utf8funcs: utf8_ok > 1", E_USER_ERROR);
-		// XXX remove end
 		require_once(WB_PATH.'/framework/functions-utf8.php');
 	}
 }
@@ -367,7 +363,7 @@
 // Will replace all numeric and named entities except > < ' " '  
 // In case of error the returned string is unchanged, and a message is emitted.
 function entities_to_umlauts($string, $charset_out=DEFAULT_CHARSET) {
-	//init utf8-functions -- workaround to prevent functions-utf8.php and charsets_table.php (~140kB) to be loaded more than once
+	//init utf8-functions
 	init_utf8funcs();
 	return entities_to_umlauts2($string, $charset_out);
 }
@@ -375,7 +371,7 @@
 // Will convert a string in $charset_in encoding to a pure ASCII string with HTML-entities.
 // In case of error the returned string is unchanged, and a message is emitted.
 function umlauts_to_entities($string, $charset_in=DEFAULT_CHARSET) {
-	//init utf8-functions -- workaround to prevent functions-utf8.php and charsets_table.php (~140kB) to be loaded more than once
+	//init utf8-functions
 	init_utf8funcs();
 	return umlauts_to_entities2($string, $charset_in);
 }
@@ -382,7 +378,7 @@
 
 // Function to convert a page title to a page filename
 function page_filename($string) {
-	//init utf8-functions -- workaround to prevent functions-utf8.php and charsets_table.php (~140kB) to be loaded more than once
+	//init utf8-functions
 	init_utf8funcs();
 	$string = entities_to_7bit($string);
 	// Now replace spaces with page spcacer
@@ -408,7 +404,7 @@
 
 // Function to convert a desired media filename to a clean filename
 function media_filename($string) {
-	//init utf8-functions -- workaround to prevent functions-utf8.php and charsets_table.php (~140kB) to be loaded more than once
+	//init utf8-functions
 	init_utf8funcs();
 	$string = entities_to_7bit($string);
 	// Now remove all bad characters