Changeset 15838

Timestamp:

2008-05-30T17:25:40+12:00 (16 years ago)

Author:

ak19

Message:

Updated the regular expression on img src link to make sure that single quotes embedded inside the link portion are not considered as marking the end of the link). Now it checks that the start and quotation marks match, i.e. starting single quote for a link should be matched by ending single quote and starting double quote with ending double quote

File:

• gsdl/trunk/perllib/plugins/HTMLPlug.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/HTMLPlug.pm

@@ -911 +911 @@
 
     #if(!$self->{'no_image_links'}){
-    $$textref =~ s/(<(?:img|embed|table|tr|td)[^>]*?(?:src|background)\s*=\s*)([\"\'][^\"\']+[\"\']|[^\s>]+)([^>]*>)/
+    $$textref =~ s/(<(?:img|embed|table|tr|td)[^>]*?(?:src|background)\s*=\s*)(([\"][^\"]+[\"])|([\'][^\"\']+[\'])|([^\s\/>]+))([^>]*>)/
     $self->replace_images ($1, $2, $3, $base_dir, $file, $doc_obj, $cursection)/isge;
     #}
@@ -930 +930 @@
     # remove quotes from link at start and end if necessary
     if ($link=~/^[\"\']/) {
-    $link=~s/^[\"\']//;$link=~s/[\"\']$//;
+    $link=~s/^[\"\']//;
+    $link=~s/[\"\']$//;
     $front.='"';
     $back="\"$back";
     }
-
     $link =~ s/\n/ /g;