X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FAdmin%2FElements%2FEditCustomFieldValuesSource;h=1e4667fcb08b53c0538f907947ea9663f7e725a9;hp=5b11ec8e0b971a75623f12d0dad60c4ec3323877;hb=187086c479a09629b7d180eec513fb7657f4e291;hpb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500

diff --git a/rt/share/html/Admin/Elements/EditCustomFieldValuesSource b/rt/share/html/Admin/Elements/EditCustomFieldValuesSource
index 5b11ec8e0..1e4667fcb 100644
--- a/rt/share/html/Admin/Elements/EditCustomFieldValuesSource
+++ b/rt/share/html/Admin/Elements/EditCustomFieldValuesSource
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2018 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -60,9 +60,7 @@ my @sources;
 foreach my $class( 'RT::CustomFieldValues', RT->Config->Get('CustomFieldValuesSources') ) {
     next unless $class;
 
-    local $@;
-    eval "require $class";
-    if( $@ ) {
+    unless ($class->require) {
         $RT::Logger->crit("Couldn't load class '$class': $@");
         next;
     }