SF.net SVN: ledger-smb:[3676] trunk

[..hidden..]

Revision: 3676
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3676&view=rev
Author:   einhverfr
Date:     2011-08-20 02:35:43 +0000 (Sat, 20 Aug 2011)

Log Message:
-----------
Partial fix for 3385894

Modified Paths:
--------------
    trunk/LedgerSMB/Form.pm
    trunk/bin/am.pl
    trunk/common.pl

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2011-08-20 02:16:40 UTC (rev 3675)
+++ trunk/LedgerSMB/Form.pm	2011-08-20 02:35:43 UTC (rev 3676)
@@ -574,8 +574,8 @@
 
     my ( $self, $init, $headeradd ) = @_;
 
-    return if $self->{header};
-
+    return if $self->{header} or $ENV{LSMB_NOHEAD};
+    $ENV{LSMB_NOHEAD} = 1; # Only run once.
     my ( $stylesheet, $favicon, $charset );
 
     if ( $ENV{GATEWAY_INTERFACE} ) {

Modified: trunk/bin/am.pl
===================================================================
--- trunk/bin/am.pl	2011-08-20 02:16:40 UTC (rev 3675)
+++ trunk/bin/am.pl	2011-08-20 02:35:43 UTC (rev 3676)
@@ -2449,7 +2449,6 @@
             # process transaction
             AM->recurring_details( \%myconfig, \%$pt, $id );
 
-            $header = $form->{header};
 
             # reset $form
             # XXX THIS IS A BUG FACTORY. PLEASE READ:
@@ -2460,11 +2459,11 @@
             # something is not being copied back that needs to be.  Looking 
             # forward to removing this code. --CT
             for ( keys %$form ) { delete $form->{$_}; }
-            for (qw(dbversion company dbh login path sessionid stylesheet timeout)) {
+            for (qw(header dbversion company dbh login path sessionid 
+                    stylesheet timeout id)
+            ) {
                 $form->{$_} = $pt->{$_};
             }
-            $form->{id}     = $id;
-            $form->{header} = $header;
             $form->db_init(\%myconfig);
 
             # post, print, email
@@ -2747,7 +2746,7 @@
     }
 
     $form->{callback} =
-"am.pl?action=recurring_transactions&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&header=$form->{header}";
+"am.pl?action=recurring_transactions&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}";
     $form->redirect;
 
 }

Modified: trunk/common.pl
===================================================================
--- trunk/common.pl	2011-08-20 02:16:40 UTC (rev 3675)
+++ trunk/common.pl	2011-08-20 02:35:43 UTC (rev 3676)
@@ -28,7 +28,7 @@
     my ( $script, $argv ) = split( /\?/, $form->{callback} );
 
     my @common_attrs = qw(
-      dbh login favicon stylesheet titlebar password custom_db_fields vc
+      dbh login favicon stylesheet titlebar password custom_db_fields vc header
     );
 
     if ( !$script ) {    # http redirect to login.pl if called w/no args


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