diff options
author | Ivan Kohler <ivan@freeside.biz> | 2013-07-02 21:11:29 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2013-07-02 21:11:29 -0700 |
commit | 3d0a1bb06b895c5be6e3f0517d355442a6b1e125 (patch) | |
tree | 84069ebc3254825b952a482e11cdbbbc69f6fe85 /rt/share/html/Elements/ShowSearch | |
parent | f3b99c11d6eed33f467dda360180a698a85c54e8 (diff) | |
parent | d62206a94d9d49ef96640e0a8ec492679f8345e9 (diff) |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt/share/html/Elements/ShowSearch')
-rw-r--r-- | rt/share/html/Elements/ShowSearch | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/rt/share/html/Elements/ShowSearch b/rt/share/html/Elements/ShowSearch index 4b96bbfda..8bdbd8aae 100644 --- a/rt/share/html/Elements/ShowSearch +++ b/rt/share/html/Elements/ShowSearch @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -46,7 +46,7 @@ %# %# END BPS TAGGED BLOCK }}} <&|/Widgets/TitleBox, - title => loc($desc, $ProcessedSearchArg->{'Rows'}), + title => loc(RT::SavedSearch->EscapeDescription($search->Description), $ProcessedSearchArg->{'Rows'}), title_href => $query_link_url.$QueryString, titleright => $customize ? loc('Edit') : '', titleright_href => $customize, @@ -141,14 +141,6 @@ foreach ( $SearchArg, $ProcessedSearchArg ) { } my $QueryString = '?' . $m->comp( '/Elements/QueryString', %$SearchArg ); - -my $desc = $search->Description; - -# we only use [_1] here, let's escape other "[" and "]" unless they are -# escaped already -$desc =~ s/(?<!~)\[(?!_1\])/~[/g; -$desc =~ s/(?<!~)(?<!\[_1)\]/~]/g; - </%init> <%ARGS> $Name => undef |