diff options
Diffstat (limited to 'rt/lib/RT/Action')
| -rw-r--r-- | rt/lib/RT/Action/AutoOpen.pm | 5 | ||||
| -rw-r--r-- | rt/lib/RT/Action/ExtractSubjectTag.pm | 10 | ||||
| -rwxr-xr-x | rt/lib/RT/Action/LinearEscalate.pm | 5 | ||||
| -rw-r--r-- | rt/lib/RT/Action/NotifyGroup.pm | 10 | ||||
| -rw-r--r-- | rt/lib/RT/Action/NotifyGroupAsComment.pm | 10 | ||||
| -rw-r--r-- | rt/lib/RT/Action/RecordComment.pm | 5 | ||||
| -rw-r--r-- | rt/lib/RT/Action/RecordCorrespondence.pm | 5 | ||||
| -rw-r--r-- | rt/lib/RT/Action/SetPriority.pm | 5 | ||||
| -rw-r--r-- | rt/lib/RT/Action/UserDefined.pm | 5 |
9 files changed, 9 insertions, 51 deletions
diff --git a/rt/lib/RT/Action/AutoOpen.pm b/rt/lib/RT/Action/AutoOpen.pm index f81fce895..b99b21474 100644 --- a/rt/lib/RT/Action/AutoOpen.pm +++ b/rt/lib/RT/Action/AutoOpen.pm @@ -97,9 +97,6 @@ sub Commit { return 1; } -eval "require RT::Action::AutoOpen_Vendor"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/AutoOpen_Vendor.pm}); -eval "require RT::Action::AutoOpen_Local"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/AutoOpen_Local.pm}); +RT::Base->_ImportOverlays(); 1; diff --git a/rt/lib/RT/Action/ExtractSubjectTag.pm b/rt/lib/RT/Action/ExtractSubjectTag.pm index e891e58d8..7121c1327 100644 --- a/rt/lib/RT/Action/ExtractSubjectTag.pm +++ b/rt/lib/RT/Action/ExtractSubjectTag.pm @@ -90,14 +90,6 @@ sub Commit { return (1); } -eval "require RT::Action::ExtractSubjectTag_Vendor"; -if ($@ && $@ !~ qr{^Can't locate RT/Action/ExtractSubjectTag_Vendor.pm}) { - die $@; -}; - -eval "require RT::Action::ExtractSubjectTag_Local"; -if ($@ && $@ !~ qr{^Can't locate RT/Action/ExtractSubjectTag_Local.pm}) { - die $@; -}; +RT::Base->_ImportOverlays(); 1; diff --git a/rt/lib/RT/Action/LinearEscalate.pm b/rt/lib/RT/Action/LinearEscalate.pm index 04affde6e..3e54320cb 100755 --- a/rt/lib/RT/Action/LinearEscalate.pm +++ b/rt/lib/RT/Action/LinearEscalate.pm @@ -263,10 +263,7 @@ sub Commit { return 1; } -eval "require RT::Action::LinearEscalate_Vendor"; -die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Action/LinearEscalate_Vendor.pm} ); -eval "require RT::Action::LinearEscalate_Local"; -die $@ if ( $@ && $@ !~ qr{^Can't locate RT/Action/LinearEscalate_Local.pm} ); +RT::Base->_ImportOverlays(); 1; diff --git a/rt/lib/RT/Action/NotifyGroup.pm b/rt/lib/RT/Action/NotifyGroup.pm index b943e2def..a0efd5b8f 100644 --- a/rt/lib/RT/Action/NotifyGroup.pm +++ b/rt/lib/RT/Action/NotifyGroup.pm @@ -201,14 +201,6 @@ L<RT::Action::NotifyGroupAsComment>, F<rt-email-group-admin> =cut -eval "require RT::Action::NotifyGroup_Vendor"; -if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyGroup_Vendor.pm}) { - die $@; -}; - -eval "require RT::Action::NotifyGroup_Local"; -if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyGroup_Local.pm}) { - die $@; -}; +RT::Base->_ImportOverlays(); 1; diff --git a/rt/lib/RT/Action/NotifyGroupAsComment.pm b/rt/lib/RT/Action/NotifyGroupAsComment.pm index 7574a8ca0..a5bc49c3a 100644 --- a/rt/lib/RT/Action/NotifyGroupAsComment.pm +++ b/rt/lib/RT/Action/NotifyGroupAsComment.pm @@ -78,14 +78,6 @@ Ruslan U. Zakirov E<lt>ruz@bestpractical.comE<gt> =cut -eval "require RT::Action::NotifyGroupAsComment_Vendor"; -if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyGroupAsComment_Vendor.pm}) { - die $@; -}; - -eval "require RT::Action::NotifyGroupAsComment_Local"; -if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyGroupAsComment_Local.pm}) { - die $@; -}; +RT::Base->_ImportOverlays(); 1; diff --git a/rt/lib/RT/Action/RecordComment.pm b/rt/lib/RT/Action/RecordComment.pm index ccec8fab3..5d3664d16 100644 --- a/rt/lib/RT/Action/RecordComment.pm +++ b/rt/lib/RT/Action/RecordComment.pm @@ -111,9 +111,6 @@ sub CreateTransaction { } -eval "require RT::Action::RecordComment_Vendor"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/RecordComment_Vendor.pm}); -eval "require RT::Action::RecordComment_Local"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/RecordComment_Local.pm}); +RT::Base->_ImportOverlays(); 1; diff --git a/rt/lib/RT/Action/RecordCorrespondence.pm b/rt/lib/RT/Action/RecordCorrespondence.pm index abbcfc75a..109c0df91 100644 --- a/rt/lib/RT/Action/RecordCorrespondence.pm +++ b/rt/lib/RT/Action/RecordCorrespondence.pm @@ -112,9 +112,6 @@ sub CreateTransaction { } -eval "require RT::Action::RecordCorrespondence_Vendor"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/RecordCorrespondence_Vendor.pm}); -eval "require RT::Action::RecordCorrespondence_Local"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/RecordCorrespondence_Local.pm}); +RT::Base->_ImportOverlays(); 1; diff --git a/rt/lib/RT/Action/SetPriority.pm b/rt/lib/RT/Action/SetPriority.pm index bdd50a374..420f9bd24 100644 --- a/rt/lib/RT/Action/SetPriority.pm +++ b/rt/lib/RT/Action/SetPriority.pm @@ -76,9 +76,6 @@ sub Commit { } -eval "require RT::Action::SetPriority_Vendor"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/SetPriority_Vendor.pm}); -eval "require RT::Action::SetPriority_Local"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/SetPriority_Local.pm}); +RT::Base->_ImportOverlays(); 1; diff --git a/rt/lib/RT/Action/UserDefined.pm b/rt/lib/RT/Action/UserDefined.pm index 9c36504fa..3d8e73cb0 100644 --- a/rt/lib/RT/Action/UserDefined.pm +++ b/rt/lib/RT/Action/UserDefined.pm @@ -83,10 +83,7 @@ sub Commit { return ($retval); } -eval "require RT::Action::UserDefined_Vendor"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/UserDefined_Vendor.pm}); -eval "require RT::Action::UserDefined_Local"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/UserDefined_Local.pm}); +RT::Base->_ImportOverlays(); 1; |