[Rt-commit] rt branch, master, updated. rt-4.2.11-105-g7b5c970

[Alex Vandiver]

The branch, master has been updated
       via  7b5c97097ad3b6ed2db8fd6305ab550b7b75712e (commit)
      from  f7affbd9a5c6df7309109e7f3c7860269402e4a4 (commit)

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

- Log -----------------------------------------------------------------
commit 7b5c97097ad3b6ed2db8fd6305ab550b7b75712e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu May 7 20:06:26 2015 -0400

    Update shredder's "find_disabled_rows" to the non-deprecated form
    
    54072f91 in master merged "find_disabled_rows" and "find_expired_rows"
    into one consistent flag.  Meanwhile, 793020d6 in 4.2-trunk merged
    RT::Shredder::Record into RT::Record -- however, it failed to include
    one key step: removing RT::Shredder::Record.  As such, the 4.2->master
    merge did not conflict (which would have signaled that master's
    RT::Record must be updated).
    
    Update RT::Record's new code, obtained from 793020d6 in 4.2-trunk, to
    accommodate the new flags required after 54072f91.  The removal of
    RT::Shredder::Record will be done on 4.2-trunk.

diff --git a/lib/RT/Record.pm b/lib/RT/Record.pm
index 66c97b6..61f9eec 100644
--- a/lib/RT/Record.pm
+++ b/lib/RT/Record.pm
@@ -2671,7 +2671,7 @@ sub __DependsOn
 
 # Object custom field values
     my $objs = $self->CustomFieldValues;
-    $objs->{'find_expired_rows'} = 1;
+    $objs->{'find_disabled_rows'} = 1;
     push( @$list, $objs );
 
 # Object attributes

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