[Openinteract-commits] CVS: OpenInteract OpenInteract.pm,1.20,1.21

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

Update of /cvsroot/openinteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv8498

Modified Files:
	OpenInteract.pm 
Log Message:
don't call $R->CONFIG if $R isn't a ref (in case of error)


Index: OpenInteract.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** OpenInteract.pm	2001/11/08 15:14:06	1.20
--- OpenInteract.pm	2001/11/15 05:19:08	1.21
***************
*** 352,361 ****
  sub send_html {
      my ( $class, $apache, $content, $R ) = @_;
!     $R ||= {};
      my $content_type = $R->{page}{content_type} || $apache->content_type || 'text/html';
      $content_type = ( $content_type eq 'httpd/unix-directory' ) ? 'text/html' : $content_type;
-     unless ( $R->CONFIG->{no_promotion} ) {
-         $apache->headers_out->{'X-Powered-By'} = "OpenInteract $OpenInteract::VERSION";
-     }
      $apache->send_http_header( $content_type );
      $apache->print( $content );
--- 352,362 ----
  sub send_html {
      my ( $class, $apache, $content, $R ) = @_;
!     if ( ref $R ) {
!         unless ( $R->CONFIG->{no_promotion} ) {
!             $apache->headers_out->{'X-Powered-By'} = "OpenInteract $OpenInteract::VERSION";
!         }
!     }
      my $content_type = $R->{page}{content_type} || $apache->content_type || 'text/html';
      $content_type = ( $content_type eq 'httpd/unix-directory' ) ? 'text/html' : $content_type;
      $apache->send_http_header( $content_type );
      $apache->print( $content );