X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FMakeClicky;h=4d28771e2120b25eefa85966a7fc6505f0813d6b;hb=1c538bfabc2cd31f27067505f0c3d1a46cba6ef0;hp=4607ba0929f8858f0520be66cd0bf0d308698dae;hpb=4f5619288413a185e9933088d9dd8c5afbc55dfa;p=freeside.git
diff --git a/rt/share/html/Elements/MakeClicky b/rt/share/html/Elements/MakeClicky
index 4607ba092..4d28771e2 100644
--- a/rt/share/html/Elements/MakeClicky
+++ b/rt/share/html/Elements/MakeClicky
@@ -50,7 +50,7 @@ use Regexp::Common qw(URI);
my $escaper = sub {
my $content = shift;
- RT::Interface::Web::EscapeUTF8( \$content );
+ RT::Interface::Web::EscapeHTML( \$content );
return $content;
};
@@ -61,15 +61,19 @@ my %actions = (
},
url => sub {
my %args = @_;
+ my $post = "";
+ $post = ")" if $args{value} !~ /\(/ and $args{value} =~ s/\)$//;
$args{value} = $escaper->($args{value});
- my $result = qq{[}. loc('Open URL') .qq{]};
- return $args{value} . qq{ $result};
+ my $result = qq{[}. loc('Open URL') .qq{]};
+ return $args{value} . qq{ $result$post};
},
url_overwrite => sub {
my %args = @_;
+ my $post = "";
+ $post = ")" if $args{value} !~ /\(/ and $args{value} =~ s/\)$//;
$args{value} = $escaper->($args{value});
- my $result = qq{$args{value}};
- return qq{$result};
+ my $result = qq{$args{value}};
+ return qq{$result$post};
},
);
@@ -144,14 +148,14 @@ if ( defined $cache ) {
}
unless ( $regexp ) {
- RT::Interface::Web::EscapeUTF8( $content ) unless $html;
+ RT::Interface::Web::EscapeHTML( $content ) unless $html;
return;
}
my $pos = 0;
while ( $$content =~ /($regexp)/gsio ) {
my $match = $1;
- next if $` =~ /href=(?:"|")$/;
+ next if $` =~ /\w+=(?:"|")$/;
my $skipped_len = pos($$content) - $pos - length($match);
if ( $skipped_len > 0 ) {
my $plain;