[Rt-commit] rtir branch, 2.4-trunk, updated. 568e88b318913c153d0e12894a185dc07b0a8f2e

[Ruslan Zakirov]

The branch, 2.4-trunk has been updated
       via  568e88b318913c153d0e12894a185dc07b0a8f2e (commit)
      from  50802d271799133e6083a877dd7df27ad4e8fd46 (commit)

Summary of changes:
 lib/RT/IR.pm |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 568e88b318913c153d0e12894a185dc07b0a8f2e
Author: Ruslan Zakirov <ruz at bestpractica.com>
Date:   Wed Aug 12 17:29:48 2009 +0400

    explicit Content limit
    
    We should use explicit .Content subkey to avoid magic we have in RT
    regarding LargeContent and Content

diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index be0fcb6..7edbc3d 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -284,7 +284,10 @@ wrap 'RT::Tickets::_CustomFieldLimit',
         my ($tickets, $field, $op, $value, %rest) = @_[0..($#_-1)];
         $tickets->_OpenParen;
         unless ( $op =~ /NOT|!=|<>/i ) { # positive equation
-            $tickets->_CustomFieldLimit($field, '<=', $end_ip, %rest);
+            $tickets->_CustomFieldLimit(
+                $field, '<=', $end_ip, %rest,
+                SUBKEY => $rest{'SUBKEY'}. '.Content',
+            );
             $tickets->_CustomFieldLimit(
                 $field, '>=', $start_ip, %rest,
                 SUBKEY          => $rest{'SUBKEY'}. '.LargeContent',
@@ -294,6 +297,7 @@ wrap 'RT::Tickets::_CustomFieldLimit',
             # estimations and scan less rows
             $tickets->_CustomFieldLimit(
                 $field, '>=', '000.000.000.000', %rest,
+                SUBKEY          => $rest{'SUBKEY'}. '.Content',
                 ENTRYAGGREGATOR => 'AND',
             );
             $tickets->_CustomFieldLimit(

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