diff options
| author | ivan <ivan> | 2011-04-18 23:15:19 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-04-18 23:15:19 +0000 |
| commit | b5c4237a34aef94976bc343c8d9e138664fc3984 (patch) | |
| tree | ba7cb2c13c199b1012c661fcf4f248e7b7e3d36f /rt/lib/RT/Search | |
| parent | 96a0d937cdfe26d691e59139088e33e0bc3e1184 (diff) | |
| parent | 75162bb14b3e38d66617077843f4dfdcaf09d5c4 (diff) | |
This commit was generated by cvs2svn to compensate for changes in r11022,
which included commits to RCS files with non-trunk default branches.
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 |
3 files changed, 3 insertions, 15 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; |