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

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

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

Modified Files:
	MainTemplate.pm 
Log Message:
don't die if we can't merge the content...


Index: MainTemplate.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Controller/MainTemplate.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MainTemplate.pm	22 Sep 2005 03:43:39 -0000	1.11
--- MainTemplate.pm	22 Sep 2005 03:59:31 -0000	1.12
***************
*** 100,109 ****
      };
      if ( $@ ) {
!         my $msg = "Content generator failed to execute: $@";
          $log->error( $msg );
!         oi_error $msg;
      }
!     $log->is_debug &&
!         $log->debug( "Generated content ok, setting to response" );
      CTX->response->content( \$full_content );
      return;
--- 100,112 ----
      };
      if ( $@ ) {
!         my $msg = "Content generator failed to execute ($@); will " .
!                   "return previously-generated content...";
          $log->error( $msg );
!         $full_content = $content;
      }
!     else {
!         $log->is_debug && $log->debug( "Generated content ok..." );
!     }
!     $log->is_debug && $log->debug( "Setting content to response" );
      CTX->response->content( \$full_content );
      return;