[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.0-52-g4e1ac8f

[Shawn Moore]

The branch, 4.4-trunk has been updated
       via  4e1ac8ff445e3899f31c1f997c946f5bfb6aebdf (commit)
      from  06582e92c9aad126a3ff3b519a97e5ca88aec26a (commit)

Summary of changes:
 lib/RT/Tickets.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 4e1ac8ff445e3899f31c1f997c946f5bfb6aebdf
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed Feb 24 17:14:32 2016 +0000

    Fix entryaggregator in non-indexed FTS
    
        This was breaking t/fts/not_indexed.t by switching an "AND" to an "OR"
    
        "When you're using ->_OpenParen(), the aggregator which gets used
        _outside_ the paren is set by the first ->Limit call _inside_ the
        paren."

diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 725d828..7b46e83 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -979,13 +979,13 @@ sub _TransContentLimit {
         }
     } else {
         $self->Limit(
+            %rest,
             ALIAS    => $txn_alias,
             FIELD    => 'Type',
             OPERATOR => 'NOT IN',
             VALUE    => ['EmailRecord', 'CommentEmailRecord'],
         );
         $self->Limit(
-            %rest,
             ENTRYAGGREGATOR => 'AND',
             ALIAS           => $self->{_sql_trattachalias},
             FIELD           => $field,

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