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

[..hidden..]

Revision: 3971
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3971&view=rev
Author:   einhverfr
Date:     2011-11-10 06:42:26 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Fixing file not found printing HTML invoice

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/Template/HTML.pm
    branches/1.3/LedgerSMB/Template.pm
    branches/1.3/templates/demo/invoice.html

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2011-11-10 05:52:12 UTC (rev 3970)
+++ branches/1.3/Changelog	2011-11-10 06:42:26 UTC (rev 3971)
@@ -5,6 +5,7 @@
 Changelog for LedgerSMB 1.3.5
 * Fixing Menu and Permissions bug 3430820 (Chris T)
 * Fixing permissions bug 3433644 (Chris T)
+* Fixing file not found printing HTML invoice (Chris T)
 
 Changelog for LedgerSMB 1.3.4
 * Corrected case matching error in upgrade script (Chris T)

Modified: branches/1.3/LedgerSMB/Template/HTML.pm
===================================================================
--- branches/1.3/LedgerSMB/Template/HTML.pm	2011-11-10 05:52:12 UTC (rev 3970)
+++ branches/1.3/LedgerSMB/Template/HTML.pm	2011-11-10 06:42:26 UTC (rev 3971)
@@ -64,7 +64,6 @@
     my $vars;
     my $type = ref $rawvars;
 
-    #XXX fix escaping function
     return $rawvars if $type =~ /^LedgerSMB::Locale/;
     return unless defined $rawvars;
     if ( $type eq 'ARRAY' ) {
@@ -124,7 +123,7 @@
             $tempdir = undef;
         }
 	$template = Template->new({
-		INCLUDE_PATH => [$parent->{include_path}, 'UI/lib'],
+		INCLUDE_PATH => [$parent->{include_path_lang}, $parent->{include_path}, 'UI/lib'],
 		START_TAG => quotemeta('<?lsmb'),
 		END_TAG => quotemeta('?>'),
 		DELIMITER => ';',

Modified: branches/1.3/LedgerSMB/Template.pm
===================================================================
--- branches/1.3/LedgerSMB/Template.pm	2011-11-10 05:52:12 UTC (rev 3970)
+++ branches/1.3/LedgerSMB/Template.pm	2011-11-10 06:42:26 UTC (rev 3971)
@@ -190,9 +190,8 @@
 				throw Error::Simple 'Invalid language';
 				return undef;
 			}
-			$self->{include_path} = "$self->{'include_path'}"
-					."/$self->{language}"
-					.";$self->{'include_path'}";
+			$self->{include_path_lang} = "$self->{'include_path'}"
+					."/$self->{language}";
                         $self->{locale} 
                              = LedgerSMB::Locale->get_handle($self->{language});
 		}

Modified: branches/1.3/templates/demo/invoice.html
===================================================================
--- branches/1.3/templates/demo/invoice.html	2011-11-10 05:52:12 UTC (rev 3970)
+++ branches/1.3/templates/demo/invoice.html	2011-11-10 06:42:26 UTC (rev 3971)
@@ -3,7 +3,7 @@
 
 <table width="100%">
 
-  <?lsmb INCLUDE letterhead.html ?>
+  <?lsmb INCLUDE "letterhead.html" ?>
   
   <tr>
     <td width=10>&nbsp;</td>

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