SF.net SVN: ledger-smb:[4089] branches/1.3

[..hidden..]

Revision: 4089
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4089&view=rev
Author:   einhverfr
Date:     2011-11-26 07:38:40 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Change to ensure template handling is safe when mixed in output with old legacy mechanisms.  Corrects bug 3385894

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/Form.pm
    branches/1.3/LedgerSMB/Template.pm

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2011-11-26 05:19:47 UTC (rev 4088)
+++ branches/1.3/Changelog	2011-11-26 07:38:40 UTC (rev 4089)
@@ -26,6 +26,7 @@
 * Removed broken edit buttons on bank account tab of contacts form (Chris T)
 * Corrected UI glitches involving adding employee contact info (Chris T)
 * Corrected missing translation call in contact template (Chris T)
+* Corrected UI glitch when processing recurring transactions (Chris T)
 
 Changelog for LedgerSMB 1.3.6
 * Including xelatex templates under directory templates/xedemo (Chris T)

Modified: branches/1.3/LedgerSMB/Form.pm
===================================================================
--- branches/1.3/LedgerSMB/Form.pm	2011-11-26 05:19:47 UTC (rev 4088)
+++ branches/1.3/LedgerSMB/Form.pm	2011-11-26 07:38:40 UTC (rev 4089)
@@ -402,7 +402,7 @@
 
     }
     else {
-        delete $self->{header};
+        #delete $self->{header};
 
         for ( sort keys %$self ) {
             print qq|<input type="hidden" name="$_" value="|

Modified: branches/1.3/LedgerSMB/Template.pm
===================================================================
--- branches/1.3/LedgerSMB/Template.pm	2011-11-26 05:19:47 UTC (rev 4088)
+++ branches/1.3/LedgerSMB/Template.pm	2011-11-26 07:38:40 UTC (rev 4089)
@@ -347,11 +347,13 @@
 		$name =~ s#^.*/##;
 		$disposition .= qq|\nContent-Disposition: attachment; filename="$name"|;
 	}
-	if ($self->{mimetype} =~ /^text/) {
+        if (!$ENV{LSMB_NOHEAD}){
+ 	    if ($self->{mimetype} =~ /^text/) {
 		print "Content-Type: $self->{mimetype}; charset=utf-8$disposition\n\n";
-	} else {
+	    } else {
 		print "Content-Type: $self->{mimetype}$disposition\n\n";
-	}
+	    }
+        }
 	binmode STDOUT, ':utf8';
 	print $data;
 }

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