openinteract-commits

[<a_...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ContentGenerator
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6239

Modified Files:
	TT2Process.pm TemplateSource.pm 
Log Message:
Allow template processing through OI2 interfaces even when no request or controller is present

Index: TT2Process.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ContentGenerator/TT2Process.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** TT2Process.pm	23 May 2005 10:21:04 -0000	1.22
--- TT2Process.pm	9 Mar 2007 03:52:41 -0000	1.23
***************
*** 72,80 ****
      # available:
  
!     my $lh = CTX->request->language_handle;
!     $template_vars->{MSG} = sub {
!         return ( $lh ) ? $lh->maketext( @_ ) : "$_[0]: no language handle";
!     };
!     $template_vars->{LH}  = $lh;
  
      $self->_customize_template_variables( $template_name, $template_vars );
--- 72,85 ----
      # available:
  
!     if ( CTX->request ) {
!         my $lh = CTX->request->language_handle;
!         $template_vars->{MSG} = sub {
!             return ( $lh ) ? $lh->maketext( @_ ) : "$_[0]: no language handle";
!         };
!         $template_vars->{LH}  = $lh;
!     }
!     else {
!         $template_vars->{MSG} = sub { return "$_[0]: no language handle" };
!     }
  
      $self->_customize_template_variables( $template_name, $template_vars );

Index: TemplateSource.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/ContentGenerator/TemplateSource.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TemplateSource.pm	17 Mar 2005 14:58:01 -0000	1.15
--- TemplateSource.pm	9 Mar 2007 03:52:41 -0000	1.16
***************
*** 88,92 ****
      }
  
!     if ( $name and CTX->controller->can( 'add_template_used' ) ) {
          CTX->controller->add_template_used( $name );
      }
--- 88,92 ----
      }
  
!     if ( $name and CTX->controller and CTX->controller->can( 'add_template_used' ) ) {
          CTX->controller->add_template_used( $name );
      }