Merge branch '4.4-trunk' into 4.4.5-releng

bestpractical · Sep 14, 2021 · edbeab1 · edbeab1
2 parents 4727a46 + 8d46147
commit edbeab1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/RT/Handle.pm b/lib/RT/Handle.pm
@@ -468,6 +468,9 @@ sub InsertACL {
         $path = $base_path;
     }
 
+    # Get the full path since . is no longer in @INC after perl 5.24
+    $path = Cwd::abs_path($path);
+
     local *acl;
     do $path || return (0, "Couldn't load ACLs: " . $@);
     my @acl = acl($dbh);
@@ -864,6 +867,8 @@ sub InsertData {
 
     local $@;
 
+    # Get the full path since . is no longer in @INC after perl 5.24
+    $datafile = Cwd::abs_path($datafile);
     $RT::Logger->debug("Going to load '$datafile' data file");
 
     my $datafile_content = do {