From bb9f10fb29696d731f2ac1cc3a8942a1b5fb3715 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 1 Aug 2004 08:05:44 +0000 Subject: [PATCH] removed ereg_replace which causes problems with multibyte charsets and mbstring.function_overload=7 --- phpgwapi/inc/class.translation_sql.inc.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/phpgwapi/inc/class.translation_sql.inc.php b/phpgwapi/inc/class.translation_sql.inc.php index e61ce965a1..4e1d7ad5c8 100644 --- a/phpgwapi/inc/class.translation_sql.inc.php +++ b/phpgwapi/inc/class.translation_sql.inc.php @@ -413,16 +413,19 @@ $lines = file($appfile); foreach($lines as $line) { - $line = eregi_replace("\t+", "\t", $line); - $_f_buffer = split("\t", $line); - if( count($_f_buffer) > 4 ) - { - $this->line_rejected[] = Array("appfile" => $appfile, "line" => $line); - } - // explode with "\t" and removing "\n" with str_replace, needed to work with mbstring.overload=7 - list($message_id,$app_name,,$content) = explode("\t",$line); + list($message_id,$app_name,,$content) = $_f_buffer = explode("\t",$line); $content=str_replace(array("\n","\r"),'',$content); + + if( count($_f_buffer) != 4 ) + { + $line_display = str_replace(array("\t","\n"), + array("\\t","\\n"), $line); + $this->line_rejected[] = array( + 'appfile' => $appfile, + 'line' => $line_display, + ); + } $message_id = substr(strtolower(chop($message_id)),0,MAX_MESSAGE_ID_LENGTH); $app_name = chop($app_name); $raw[$app_name][$message_id] = $content;