[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/TT2 Plugin.pm,1.15,1.16

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

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

Modified Files:
	Plugin.pm 
Log Message:
don't pass the 'do_not_escape' argument onto the URL creator



Index: Plugin.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/TT2/Plugin.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Plugin.pm	24 Nov 2004 14:16:01 -0000	1.15
--- Plugin.pm	25 Nov 2004 03:58:57 -0000	1.16
***************
*** 354,376 ****
                       join( '; ', map { "$_ = $p->{$_}" } keys %{ $p } ) );
      my ( $url_base );
      if ( $p->{BASE} ) {
          $url_base = $p->{BASE};
          delete $p->{ $_ } for ( qw( ACTION TASK BASE IMAGE STATIC ) );
!         return $U->create( $url_base, $p, $p->{do_not_escape} );
      }
      elsif ( $p->{ACTION} ) {
          my ( $action, $task ) = ( $p->{ACTION}, $p->{TASK} );
          delete $p->{ $_ } for ( qw( ACTION TASK BASE IMAGE STATIC ) );
!         return $U->create_from_action( $action, $task, $p, $p->{do_not_escape} );
      }
      elsif ( $p->{IMAGE} ) {
          my $image_url = $p->{IMAGE};
          delete $p->{ $_ } for ( qw( ACTION TASK BASE IMAGE STATIC ) );
!         return $U->create_image( $image_url, $p, $p->{do_not_escape} );
      }
      elsif ( $p->{STATIC} ) {
          my $static_url = $p->{STATIC};
          delete $p->{ $_ } for ( qw( ACTION TASK BASE IMAGE STATIC ) );
!         return $U->create_static( $static_url, $p, $p->{do_not_escape} );
      }
      else {
--- 354,378 ----
                       join( '; ', map { "$_ = $p->{$_}" } keys %{ $p } ) );
      my ( $url_base );
+     my $no_escape = $p->{do_not_escape};
+     delete $p->{do_not_escape};
      if ( $p->{BASE} ) {
          $url_base = $p->{BASE};
          delete $p->{ $_ } for ( qw( ACTION TASK BASE IMAGE STATIC ) );
!         return $U->create( $url_base, $p, $no_escape );
      }
      elsif ( $p->{ACTION} ) {
          my ( $action, $task ) = ( $p->{ACTION}, $p->{TASK} );
          delete $p->{ $_ } for ( qw( ACTION TASK BASE IMAGE STATIC ) );
!         return $U->create_from_action( $action, $task, $p, $no_escape );
      }
      elsif ( $p->{IMAGE} ) {
          my $image_url = $p->{IMAGE};
          delete $p->{ $_ } for ( qw( ACTION TASK BASE IMAGE STATIC ) );
!         return $U->create_image( $image_url, $p, $no_escape );
      }
      elsif ( $p->{STATIC} ) {
          my $static_url = $p->{STATIC};
          delete $p->{ $_ } for ( qw( ACTION TASK BASE IMAGE STATIC ) );
!         return $U->create_static( $static_url, $p, $no_escape );
      }
      else {