From 6e1a82437450ab7ffed8863cf22f57e01f9fc8ed Mon Sep 17 00:00:00 2001
From: acli <acli>
Date: Tue, 17 Feb 2004 07:45:17 +0000
Subject: [PATCH] The previous change was wrong.

---
 misc/translator/TmplTokenizer.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/misc/translator/TmplTokenizer.pm b/misc/translator/TmplTokenizer.pm
index 8c7db7cd7f..4a5e5cf729 100644
--- a/misc/translator/TmplTokenizer.pm
+++ b/misc/translator/TmplTokenizer.pm
@@ -403,9 +403,12 @@ sub blank_p ($) {
 }
 
 sub trim ($) {
-    my($s) = @_;
-    $s =~ /^(\s|\&nbsp$re_end_entity)*(.*)(\s|\&nbsp$re_end_entity)*$/os;
-    return wantarray? ($2, $1, $3): $2;
+    my($s0) = @_;
+    my $l0 = length $s0;
+    my $s = $s0;
+    $s =~ s/^(\s|\&nbsp$re_end_entity)+//os; my $l1 = $l0 - length $s;
+    $s =~ s/(\s|\&nbsp$re_end_entity)+$//os; my $l2 = $l0 - $l1 - length $s;
+    return wantarray? (substr($s0, 0, $l1), $s, substr($s0, $l0 - $l2)): $s;
 }
 
 ###############################################################################
-- 
2.39.5