[interchange-cvs] interchange - kwalsh modified 2 files

[interchange-cvs at icdevgroup.org]

User:      kwalsh
Date:      2007-08-04 00:32:41 GMT
Modified:  code/UserTag button.tag
Modified:  code/SystemTag image.tag
Log:
    * Small correction to the "src" parameter to make it look for
      "http://" or "https://", at the start of the string, instead
      of the following previous behaviour:

	-- The [button] tag was just looking for "http:" or "https:"
	   at the start of the string.

	-- The [image] tag was worse, and just looking for "http" at
	   the start of the string.

Revision  Changes    Path
1.23      +3 -3      interchange/code/UserTag/button.tag


rev 1.23, prev_rev 1.22
Index: button.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/button.tag,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- button.tag	30 Mar 2007 23:40:56 -0000	1.22
+++ button.tag	4 Aug 2007 00:32:41 -0000	1.23
@@ -5,13 +5,13 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.  See the LICENSE file for details.
 # 
-# $Id: button.tag,v 1.22 2007/03/30 23:40:56 pajamian Exp $
+# $Id: button.tag,v 1.23 2007/08/04 00:32:41 kwalsh Exp $
 
 UserTag button Order     name src text
 UserTag button addAttr
 UserTag button attrAlias value text
 UserTag button hasEndTag
-UserTag button Version   $Revision: 1.22 $
+UserTag button Version   $Revision: 1.23 $
 UserTag button Routine   <<EOR
 sub {
 	my ($name, $src, $text, $opt, $action) = @_;
@@ -35,7 +35,7 @@
 		my $id = $Tag->image( { dir_only => 1 } );
 		$id =~ s:/+$::;
 		$id =~ s:/~[^/]+::;
-		if(	$src =~ m{^https?:}i ) {
+		if(	$src =~ m{^https?://}i ) {
 			$image = $src;
 		}
 		elsif( $dr and $id and $src =~ m{^[^/]} and -f "$dr$id/$src" ) {



1.19      +3 -3      interchange/code/SystemTag/image.tag


rev 1.19, prev_rev 1.18
Index: image.tag
===================================================================
RCS file: /var/cvs/interchange/code/SystemTag/image.tag,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- image.tag	30 Mar 2007 23:40:49 -0000	1.18
+++ image.tag	4 Aug 2007 00:32:41 -0000	1.19
@@ -5,13 +5,13 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.  See the LICENSE file for details.
 # 
-# $Id: image.tag,v 1.18 2007/03/30 23:40:49 pajamian Exp $
+# $Id: image.tag,v 1.19 2007/08/04 00:32:41 kwalsh Exp $
 
 UserTag image Order     src
 UserTag image AttrAlias geometry makesize
 UserTag image AttrAlias resize makesize
 UserTag image AddAttr
-UserTag image Version   $Revision: 1.18 $
+UserTag image Version   $Revision: 1.19 $
 UserTag image Routine   <<EOR
 sub {
 	my ($src, $opt) = @_;
@@ -25,7 +25,7 @@
 	my @imagefields = qw( image );
 	my @imagesuffixes = qw( jpg gif png jpeg );
 	my $filere = qr/\.\w{2,4}$/;
-	my $absurlre = qr/^(?i:https?)/;
+	my $absurlre = qr!^(?i:https?)://!;
 
 	if ($opt->{ui}) {
 		# unless no image dir specified, add locale string