[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Controller MainTemplate.pm,1.10,1.11

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Controller
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2309

Modified Files:
	MainTemplate.pm 
Log Message:
don't lose $@


Index: MainTemplate.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Controller/MainTemplate.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MainTemplate.pm	21 Sep 2005 04:11:19 -0000	1.10
--- MainTemplate.pm	22 Sep 2005 03:43:39 -0000	1.11
***************
*** 47,55 ****
      my $content = eval { $action->execute };
      if ( $@ ) {
!         $log->error( "Caught exception from action: $@" );
  
          # TODO: Set this error message from config file
          $self->add_content_param( title => 'Action execution error' );
-         $content = $@;
      }
  
--- 47,56 ----
      my $content = eval { $action->execute };
      if ( $@ ) {
!         my $error = $@;
!         $log->error( "Caught exception from action: $error" );
!         $content = $error;
  
          # TODO: Set this error message from config file
          $self->add_content_param( title => 'Action execution error' );
      }