X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FSearch%2FBuild.html;h=9594771f0fb82a9ea306dcedd3641d0353a6b43b;hb=ed1f84b4e8f626245995ecda5afcf83092c153b2;hp=ad680beee1d863001c83f6b68549d62b07b48814;hpb=3d0a1bb06b895c5be6e3f0517d355442a6b1e125;p=freeside.git diff --git a/rt/share/html/Search/Build.html b/rt/share/html/Search/Build.html index ad680beee..9594771f0 100644 --- a/rt/share/html/Search/Build.html +++ b/rt/share/html/Search/Build.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -190,7 +190,7 @@ my @new_values = (); # Try to find if we're adding a clause foreach my $arg ( keys %ARGS ) { - next unless $arg =~ m/^ValueOf([\w\.]+|'CF.{.*?}')$/ + next unless $arg =~ m/^ValueOf([\w\.]+|'\w*CF\.\{.*?\}')$/ && ( ref $ARGS{$arg} eq "ARRAY" ? grep $_ ne '', @{ $ARGS{$arg} } : $ARGS{$arg} ne '' ); @@ -234,10 +234,10 @@ foreach my $arg ( keys %ARGS ) { $value = "'$value'"; } - if ($keyword =~ /^'CF\.{(.*)}'/) { - my $cf = $1; + if ($keyword =~ /^'(\w*CF)\.\{(.*)\}'/) { + my ($field, $cf) = ($1, $2); $cf =~ s/(['\\])/\\$1/g; - $keyword = "'CF.{$cf}'"; + $keyword = "'$field.{$cf}'"; } my $clause = {