summaryrefslogtreecommitdiff
path: root/rt/share/html/Elements/MakeClicky
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2017-08-06 10:11:28 -0700
committerIvan Kohler <ivan@freeside.biz>2017-08-06 10:11:28 -0700
commitde9d037528895f7151a9aead6724ce2df95f9586 (patch)
tree3ba47a923a1d6033605ffc5586ed1af439d8c141 /rt/share/html/Elements/MakeClicky
parentb226bc6bd81f999176cdbfa53a799033ff0a0307 (diff)
rt 4.2.14 (#13852)
Diffstat (limited to 'rt/share/html/Elements/MakeClicky')
-rw-r--r--rt/share/html/Elements/MakeClicky8
1 files changed, 4 insertions, 4 deletions
diff --git a/rt/share/html/Elements/MakeClicky b/rt/share/html/Elements/MakeClicky
index 7c2de834d..252711b3f 100644
--- a/rt/share/html/Elements/MakeClicky
+++ b/rt/share/html/Elements/MakeClicky
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@ -63,7 +63,7 @@ my %actions = (
my %args = @_;
my $post = "";
$post = ")" if $args{value} !~ /\(/ and $args{value} =~ s/\)$//;
- $args{value} = $escaper->($args{value});
+ $args{value} = $escaper->($args{value}) unless $args{html};
my $result = qq{[<a target="_blank" href="$args{value}">}. loc('Open URL') .qq{</a>]};
return $args{value} . qq{ <span class="clickylink">$result</span>$post};
},
@@ -71,7 +71,7 @@ my %actions = (
my %args = @_;
my $post = "";
$post = ")" if $args{value} !~ /\(/ and $args{value} =~ s/\)$//;
- $args{value} = $escaper->($args{value});
+ $args{value} = $escaper->($args{value}) unless $args{html};
my $result = qq{<a target="_blank" href="$args{value}">$args{value}</a>};
return qq{<span class="clickylink">$result</span>$post};
},
@@ -169,7 +169,7 @@ while ( $$content =~ /($regexp)/gsio ) {
$pos += length($plain);
}
my $plain = $handle->(
- %ARGS,
+ %ARGS,
value => $match,
all_matches => [ $1, $2, $3, $4, $5, $6, $7, $8, $9 ],
);