rt 4.2.16

[freeside.git] / rt / lib / RT / Search.pm

diff --git a/rt/lib/RT/Search.pm b/rt/lib/RT/Search.pm
index fc56427..c065729 100755 (executable)
--- a/rt/lib/RT/Search.pm
+++ b/rt/lib/RT/Search.pm
@@ -1,40 +1,40 @@
 # BEGIN BPS TAGGED BLOCK {{{
-# 
+#
 # COPYRIGHT:
-# 
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-#                                          <jesse@bestpractical.com>
-# 
+#
+# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
+#                                          <sales@bestpractical.com>
+#
 # (Except where explicitly superseded by other copyright notices)
-# 
-# 
+#
+#
 # LICENSE:
-# 
+#
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
 # from www.gnu.org.
-# 
+#
 # This work is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-# 
-# 
+#
+#
 # CONTRIBUTION SUBMISSION POLICY:
-# 
+#
 # (The following paragraph is not intended to limit the rights granted
 # to you to modify and distribute this software under the terms of
 # the GNU General Public License and is only of importance to you if
 # you choose to contribute your changes and enhancements to the
 # community by submitting them to Best Practical Solutions, LLC.)
-# 
+#
 # By intentionally submitting any modifications, corrections or
 # derivatives to this work, or any other work intended for use with
 # Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -43,7 +43,7 @@
 # royalty-free, perpetual, license to use, copy, create derivative
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
-# 
+#
 # END BPS TAGGED BLOCK }}}
 
 =head1 NAME
@@ -75,32 +75,28 @@
 package RT::Search;
 
 use strict;
-
-# {{{ sub new 
-sub new  {
-  my $proto = shift;
-  my $class = ref($proto) || $proto;
-  my $self  = {};
-  bless ($self, $class);
-  $self->_Init(@_);
-  return $self;
-}
-# }}}
-
-# {{{ sub _Init 
-sub _Init  {
-  my $self = shift;
-  my %args = ( 
-           TicketsObj => undef,
-              Argument => undef,
-              @_ );
-  
-  $self->{'TicketsObj'} = $args{'TicketsObj'}; 
-  $self->{'Argument'} = $args{'Argument'};
+use warnings;
+
+sub new {
+    my $proto = shift;
+    my $class = ref($proto) || $proto;
+    my $self  = {};
+    bless( $self, $class );
+    $self->_Init(@_);
+    return $self;
 }
-# }}}
 
-# {{{ sub Argument 
+sub _Init {
+    my $self = shift;
+    my %args = (
+        TicketsObj => undef,
+        Argument   => undef,
+        @_
+    );
+
+    $self->{'TicketsObj'} = $args{'TicketsObj'};
+    $self->{'Argument'}   = $args{'Argument'};
+}
 
 =head2 Argument
 
@@ -108,14 +104,12 @@ Return the optional argument associated with this Search
 
 =cut
 
-sub Argument  {
-  my $self = shift;
-  return($self->{'Argument'});
+sub Argument {
+    my $self = shift;
+    return ( $self->{'Argument'} );
 }
-# }}}
-
 
-=head2 TicketsObj 
+=head2 TicketsObj
 
 Return the Tickets object passed into this search
 
@@ -123,26 +117,19 @@ Return the Tickets object passed into this search
 
 sub TicketsObj {
     my $self = shift;
-    return($self->{'TicketsObj'});
+    return ( $self->{'TicketsObj'} );
 }
 
-# {{{ sub Describe 
-sub Describe  {
-  my $self = shift;
-  return ($self->loc("No description for [_1]", ref $self));
+sub Describe {
+    my $self = shift;
+    return ( $self->loc( "No description for [_1]", ref $self ) );
 }
-# }}}
 
-# {{{ sub Prepare
-sub Prepare  {
-  my $self = shift;
-  return(1);
+sub Prepare {
+    my $self = shift;
+    return (1);
 }
-# }}}
 
-eval "require RT::Search_Vendor";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search_Vendor.pm});
-eval "require RT::Search_Local";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search_Local.pm});
+RT::Base->_ImportOverlays();
 
 1;