[Rt-commit] rt branch, 4.4/ocfv-disabled-flag, repushed

[? sunnavy]

The branch 4.4/ocfv-disabled-flag was deleted and repushed:
       was c8d240c88e0cd6c3b79e5ba611805842fd9c32ff
       now d639b5cdfdda452513f40a5a2ae4db17dc708004

1:  c8d240c ! 1:  d639b5c consistently use with_disabled_column for ObjectCustomFieldValues too
    @@ -1,6 +1,6 @@
     Author: sunnavy <sunnavy at bestpractical.com>
     
    -    iconsistently use with_disabled_column for ObjectCustomFieldValues too
    +    consistently use with_disabled_column for ObjectCustomFieldValues too
         
         no need to use an extra flag("find_expired_rows")
         
    @@ -31,36 +31,41 @@
        # By default, order by SortOrder
        $self->OrderByCols(
     @@
    -     return undef;
    - }
      
    --sub _DoSearch {
    --    my $self = shift;
    + sub _DoSearch {
    +     my $self = shift;
     -    
     -    # unless we really want to find disabled rows,
     -    # make sure we're only finding enabled ones.
     -    unless ( $self->{'find_expired_rows'} ) {
     -        $self->LimitToEnabled();
    --    }
    ++
    ++    if ( exists $self->{'find_expired_rows'} ) {
    ++        RT->Deprecated( Arguments => "find_expired_rows", Instead => 'find_disabled_rows' );
    ++        $self->{'find_disabled_rows'} = $self->{'find_expired_rows'};
    +     }
     -    
    --    return $self->SUPER::_DoSearch(@_);
    --}
    --
    --sub _DoCount {
    --    my $self = shift;
    ++
    +     return $self->SUPER::_DoSearch(@_);
    + }
    + 
    + sub _DoCount {
    +     my $self = shift;
     -    
     -    # unless we really want to find disabled rows,
     -    # make sure we're only finding enabled ones.
     -    unless ( $self->{'find_expired_rows'} ) {
     -        $self->LimitToEnabled();
    --    }
    ++
    ++    if ( exists $self->{'find_expired_rows'} ) {
    ++        RT->Deprecated( Arguments => "find_expired_rows", Instead => 'find_disabled_rows' );
    ++        $self->{'find_disabled_rows'} = $self->{'find_expired_rows'};
    +     }
     -    
    --    return $self->SUPER::_DoCount(@_);
    --}
    --
    - RT::Base->_ImportOverlays();
    ++
    +     return $self->SUPER::_DoCount(@_);
    + }
      
    - 1;
     
     diff --git a/lib/RT/Record.pm b/lib/RT/Record.pm
     --- a/lib/RT/Record.pm