[Templates-cvs] cvs commit: Template2/lib/Template/Plugin URL.pm

[cvs@template-toolkit.org]

cvs         06/01/05 09:11:14

  Modified:    lib/Template/Plugin URL.pm
  Log:
  * restored original (broken) behaviour using & to join arguments
  
  Revision  Changes    Path
  2.69      +5 -7      Template2/lib/Template/Plugin/URL.pm
  
  Index: URL.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/URL.pm,v
  retrieving revision 2.68
  retrieving revision 2.69
  diff -u -r2.68 -r2.69
  --- URL.pm	2005/12/23 17:24:59	2.68
  +++ URL.pm	2006/01/05 09:11:14	2.69
  @@ -18,7 +18,7 @@
   #
   #----------------------------------------------------------------------------
   #
  -# $Id: URL.pm,v 2.68 2005/12/23 17:24:59 darren Exp $
  +# $Id: URL.pm,v 2.69 2006/01/05 09:11:14 abw Exp $
   #
   #============================================================================
   
  @@ -27,12 +27,10 @@
   require 5.004;
   
   use strict;
  -use vars qw( @ISA $VERSION $JOINER );
  -use Template::Plugin;
  +use base 'Template::Plugin';
   
  -@ISA     = qw( Template::Plugin );
  -$VERSION = sprintf("%d.%02d", q$Revision: 2.68 $ =~ /(\d+)\.(\d+)/);
  -$JOINER  = ';';
  +our $VERSION = sprintf("%d.%02d", q$Revision: 2.69 $ =~ /(\d+)\.(\d+)/);
  +our $JOINT   = '&';
   
   
   #------------------------------------------------------------------------
  @@ -50,7 +48,7 @@
           my $newbase = shift unless ref $_[0] eq 'HASH';
           my $newargs = shift || { };
           my $combo   = { %$args, %$newargs };
  -        my $urlargs = join($JOINER,
  +        my $urlargs = join($JOINT,
   #			   map  { "$_=" . escape($combo->{ $_ }) }
   			   map  { args($_, $combo->{ $_ }) }
   			   grep { defined $combo->{ $_ } && length $combo->{ $_ } }