Fixing the real problem behind 1811022

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1746 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 5 insertions, 5 deletions

diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 02bd44aa..6dac3922 100644
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -977,13 +977,13 @@ sub datetonum {
         my $mm;
         my $dd;
 
-        if ( $myconfig->{dateformat} =~ /^yy/ ) {
+        if ( $date =~ /^\d{4}-\d\d-\d\d$/ ) {
             ( $yy, $mm, $dd ) = split /\D/, $date;
-        }
-        elsif ( $myconfig->{dateformat} =~ /^mm/ ) {
+        } if ( $myconfig->{dateformat} =~ /^yy/ ) {
+            ( $yy, $mm, $dd ) = split /\D/, $date;
+        } elsif ( $myconfig->{dateformat} =~ /^mm/ ) {
             ( $mm, $dd, $yy ) = split /\D/, $date;
-        }
-        elsif ( $myconfig->{dateformat} =~ /^dd/ ) {
+        } elsif ( $myconfig->{dateformat} =~ /^dd/ ) {
             ( $dd, $mm, $yy ) = split /\D/, $date;
         }