[Rt-commit] rt branch, master, updated. rt-4.0.4-385-gd0dbb71

[Kevin Falcone]

The branch, master has been updated
       via  d0dbb7197cae9266c2e54d82f817bd1e95d1e453 (commit)
       via  73da720e9d026be21d2e06a27d23683e13a9f65d (commit)
       via  7955df7a80307123964a67020b689c5d6a4350bd (commit)
       via  3bef226f7975150d13590c93cc73f6058ee7aecc (commit)
       via  a24027525c03a78275210567c051e7313e65bfaf (commit)
       via  2bd35abf567a55223122cedc01c18337685f47be (commit)
       via  cd59f326a857475090d14225598b6298e40ff25c (commit)
      from  f021b84f91193545edc729b8ac0a26c2faf40000 (commit)

Summary of changes:
 lib/RT/Interface/Web.pm                      |   15 ++++-----------
 lib/RT/Interface/Web/QueryBuilder/Tree.pm    |    5 +++--
 lib/RT/Report/Tickets.pm                     |    6 ------
 share/html/Search/Build.html                 |   12 ++++++------
 share/html/Search/Elements/BuildFormatString |    8 +-------
 share/html/Search/Elements/PickCFs           |   14 ++------------
 t/customfields/ip.t                          |    4 ++--
 t/customfields/iprange.t                     |    4 ++--
 t/web/query_builder.t                        |    4 ++--
 9 files changed, 22 insertions(+), 50 deletions(-)

- Log -----------------------------------------------------------------
commit 7955df7a80307123964a67020b689c5d6a4350bd
Merge: f021b84 a240275
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jan 27 19:12:55 2012 -0500

    Merge branch '4.2/remove-externalauthinfo-stub-block'


commit 73da720e9d026be21d2e06a27d23683e13a9f65d
Merge: 7955df7 3bef226
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jan 27 19:14:58 2012 -0500

    Merge branch '4.2/ticketsql-quoting'


commit d0dbb7197cae9266c2e54d82f817bd1e95d1e453
Merge: 73da720 cd59f32
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jan 27 19:16:11 2012 -0500

    Merge branch '4.2/remove-cfqueues-wrong-unquoting'

diff --cc lib/RT/Interface/Web/QueryBuilder/Tree.pm
index e2ec1e5,87b516e..34377c3
--- a/lib/RT/Interface/Web/QueryBuilder/Tree.pm
+++ b/lib/RT/Interface/Web/QueryBuilder/Tree.pm
@@@ -271,15 -271,12 +272,15 @@@ sub ParseSQL 
          if ( lc $op eq 'is' || lc $op eq 'is not' ) {
              $value = 'NULL'; # just fix possible mistakes here
          } elsif ( $value !~ /^[+-]?[0-9]+$/ ) {
 +            $value =~ s/(['\\])/\\$1/g;
              $value = "'$value'";
          }
 -        $key = "'$key'" if $key =~ /^CF./;
 +
 +        if ($key =~ s/(['\\])/\\$1/g or $key =~ /\s/) {
 +            $key = "'$key'";
 +        }
  
-         my $clause = { Key => $key, Op => $op, Value => $value };
+         my $clause = { Key => $key, Op => $op, Value => $value, RawValue => $rawvalue };
          $node->addChild( __PACKAGE__->new( $clause ) );
      };
      $callback{'Error'} = sub { push @results, @_ };

-----------------------------------------------------------------------