Merge branch 'master' of git.freeside.biz:/home/git/freeside

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

diff --git a/rt/lib/RT/Search/FromSQL.pm b/rt/lib/RT/Search/FromSQL.pm
index 364d7cf..dbcad90 100644 (file)
--- a/rt/lib/RT/Search/FromSQL.pm
+++ b/rt/lib/RT/Search/FromSQL.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -66,6 +66,7 @@ Find all tickets described by the SQL statement passed as an argument
 package RT::Search::FromSQL;
 
 use strict;
+use warnings;
 use base qw(RT::Search);
 
 =head2 Describe
@@ -74,12 +75,10 @@ Returns a localized string describing the module's function.
 
 =cut
 
-# {{{ sub Describe 
 sub Describe  {
     my $self = shift;
     return ($self->loc("TicketSQL search module", ref $self));
 }
-# }}}
 
 =head2 Prepare
 
@@ -89,18 +88,13 @@ is reduced to those tickets matching the SQL query.
 
 =cut
 
-# {{{ sub Prepare
 sub Prepare  {
     my $self = shift;
 
     $self->TicketsObj->FromSQL($self->Argument);
     return(1);
 }
-# }}}
 
-eval "require RT::Search::FromSQL_Vendor";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/FromSQL_Vendor.pm});
-eval "require RT::Search::FromSQL_Local";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/FromSQL_Local.pm});
+RT::Base->_ImportOverlays();
 
 1;