SF.net SVN: ledger-smb:[3639] trunk/LedgerSMB.pm

[..hidden..]

Revision: 3639
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3639&view=rev
Author:   einhverfr
Date:     2011-08-05 00:42:37 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
Correcting test case failure

Modified Paths:
--------------
    trunk/LedgerSMB.pm

Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm	2011-08-05 00:06:40 UTC (rev 3638)
+++ trunk/LedgerSMB.pm	2011-08-05 00:42:37 UTC (rev 3639)
@@ -238,9 +238,8 @@
     $logger->debug("Begin LedgerSMB.pm");
 
     $self->{version} = $VERSION;
-    $self->{dbversion} = "1.2.0";
-    #bless $self if defined $self;
-    #bless $type if defined $type;
+    $self->{dbversion} = "1.2.99";
+    
     bless $self, $type;
     $logger->debug("LedgerSMB::new: \$argstr = $argstr");
     my $query = ($argstr) ? new CGI::Simple($argstr) : new CGI::Simple;
@@ -306,11 +305,16 @@
 #    if ($self->{action} eq 'migrate_user'){
 #        return $self;
 #    }
+
+    # This is suboptimal.  We need to have a better way for 1.4
     if ($self->{script} eq 'login.pl' &&
         ($self->{action} eq 'authenticate'  || $self->{action} eq '__default' 
 		|| !$self->{action})){
         return $self;
     }
+    if ($self->{script} eq 'setup.pl'){
+        return $self;
+    }
     if (!$self->{company} && $self->is_run_mode('cgi', 'mod_perl')){
          my $ccookie = $cookie{${LedgerSMB::Sysconfig::cookie_name}};
          $ccookie =~ s/.*:([^:]*)$/$1/;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.