Changeset 16901 for gsdl/trunk/perllib/plugins/ImageConverter.pm

Timestamp:

2008-08-19T14:37:56+12:00 (16 years ago)

Author:

ak19

Message:

The percents in URL-encoded image filenames are only escaped with percent-25s (used in urls referring to URL-encoded filenames) if there aren't any percent-25s already in there.

File:

• gsdl/trunk/perllib/plugins/ImageConverter.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/ImageConverter.pm

@@ -186 +186 @@
     }
 
-    # Images that will get generated may contain percent signs in their src filenames
+    # The images that will get generated may contain percent signs in their src filenames
     # Encode those percent signs themselves so that urls to the imgs refer to them correctly 
-    my $url_to_filehead = $filehead; 
-    $url_to_filehead =~ s/%/%25/g; 
+    my $url_to_filehead = $filehead;
+    $url_to_filehead =~ s/%/%25/g if($url_to_filehead !~ m/%25/);
     my $url_to_filename_no_path = $filename_no_path;
-    $url_to_filename_no_path =~ s/%/%25/g; 
-
+    $url_to_filename_no_path =~ s/%/%25/g if($url_to_filename_no_path !~ m/%25/);
+    
     # Convert the image to a new type (if required).
     my $converttotype = $self->{'converttotype'};