diff options
| author | ivan <ivan> | 2011-04-18 23:15:19 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-04-18 23:15:19 +0000 |
| commit | 75162bb14b3e38d66617077843f4dfdcaf09d5c4 (patch) | |
| tree | d89dd49a476cf2f0859ed6a0adc2992ea6d69d04 /rt/lib/RT/Search | |
| parent | fc6209f398899f0211cfcedeb81a3cd65e04a941 (diff) | |
import rt 3.8.10
Diffstat (limited to 'rt/lib/RT/Search')
| -rw-r--r-- | rt/lib/RT/Search/ActiveTicketsInQueue.pm | 5 | ||||
| -rw-r--r-- | rt/lib/RT/Search/FromSQL.pm | 5 | ||||
| -rw-r--r-- | rt/lib/RT/Search/Generic.pm | 8 | ||||
| -rw-r--r-- | rt/lib/RT/Search/Googleish.pm | 5 |
4 files changed, 4 insertions, 19 deletions
diff --git a/rt/lib/RT/Search/ActiveTicketsInQueue.pm b/rt/lib/RT/Search/ActiveTicketsInQueue.pm index cc7103c55..32914567a 100644 --- a/rt/lib/RT/Search/ActiveTicketsInQueue.pm +++ b/rt/lib/RT/Search/ActiveTicketsInQueue.pm @@ -90,9 +90,6 @@ sub Prepare { } # }}} -eval "require RT::Search::ActiveTicketsInQueue_Vendor"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/ActiveTicketsInQueue_Vendor.pm}); -eval "require RT::Search::ActiveTicketsInQueue_Local"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/ActiveTicketsInQueue_Local.pm}); +RT::Base->_ImportOverlays(); 1; diff --git a/rt/lib/RT/Search/FromSQL.pm b/rt/lib/RT/Search/FromSQL.pm index 364d7cf9e..6f2a874f9 100644 --- a/rt/lib/RT/Search/FromSQL.pm +++ b/rt/lib/RT/Search/FromSQL.pm @@ -98,9 +98,6 @@ sub Prepare { } # }}} -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; diff --git a/rt/lib/RT/Search/Generic.pm b/rt/lib/RT/Search/Generic.pm index 57cbfb607..589033e16 100644 --- a/rt/lib/RT/Search/Generic.pm +++ b/rt/lib/RT/Search/Generic.pm @@ -68,13 +68,7 @@ use warnings; package RT::Search::Generic; use base 'RT::Search'; -eval "require RT::Search::Generic_Vendor"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/Generic_Vendor.pm}); -warn "RT::Search::Generic has become RT::Search. Please adjust your RT::Search::Generic_Vendor file at " . $INC{"RT/Search/Generic_Vendor.pm"} if !$@; - -eval "require RT::Search::Generic_Local"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/Generic_Local.pm}); -warn "RT::Search::Generic has become RT::Search. Please adjust your RT::Search::Generic_Local file at " . $INC{"RT/Search/Generic_Local.pm"} if !$@; +RT::Base->_ImportOverlays; 1; diff --git a/rt/lib/RT/Search/Googleish.pm b/rt/lib/RT/Search/Googleish.pm index 4b73dd707..317480014 100644 --- a/rt/lib/RT/Search/Googleish.pm +++ b/rt/lib/RT/Search/Googleish.pm @@ -202,9 +202,6 @@ sub Prepare { } # }}} -eval "require RT::Search::Googleish_Vendor"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/Googleish_Vendor.pm}); -eval "require RT::Search::Googleish_Local"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Search/Googleish_Local.pm}); +RT::Base->_ImportOverlays(); 1; |