From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 3 Mar 2010 11:28:27 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~44^2~7
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/e74aaa36273deffbb11464af4296aa9b91168b9d?hp=23a659bbd2b771f3f25592386842eaf8c6b4bade

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

diff --git a/SL/Locale.pm b/SL/Locale.pm
index d6ac18157..87008734a 100644
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -358,11 +358,7 @@ sub reformat_date {
     sprintf("%0" . (length($&)) . "d", $mm);
 
   $output_format =~ /y+/;
-  if (length($&) == 2) {
-    $yy -= $yy >= 2000 ? 2000 : 1900;
-  }
-  substr($output_format, $-[0], $+[0] - $-[0]) =
-    sprintf("%0" . (length($&)) . "d", $yy);
+  substr($output_format, $-[0], $+[0] - $-[0]) = $yy;
 
   $main::lxdebug->leave_sub();