Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[mfinanz.git] / SL / DB / Helper / CustomVariables.pm

diff --git a/SL/DB/Helper/CustomVariables.pm b/SL/DB/Helper/CustomVariables.pm
index 78edce5e356ae9321529ade0d6e5828eab767f44..a6ab5ae18859f8bf7e8035069c42ea8c38a06c3e 100644 (file)
--- a/SL/DB/Helper/CustomVariables.pm
+++ b/SL/DB/Helper/CustomVariables.pm
@@ -4,7 +4,7 @@ use strict;
 use Carp;
 use Data::Dumper;
 use List::Util qw(first);
-use List::UtilsBy qw(sort_by partition_by);
+use List::UtilsBy qw(partition_by);
 
 use constant META_CVARS => 'cvars_config';
 
@@ -104,8 +104,6 @@ sub make_cvar_by_configs {
       @$configs
     );
 
-    @return = sort_by { $_->config->sortkey } @return;
-
     return \@return;
   }
 }
@@ -182,7 +180,7 @@ sub _all_configs {
   }
 
   return $params{module} && !ref $params{module} ? $cache->{module}{$params{module}}
-       : $params{module} &&  ref $params{module} ? [ map { @{ $cache->{module}{$_} } } @{ $params{module} } ]
+       : $params{module} &&  ref $params{module} ? [ map { @{ $cache->{module}{$_} // [] } } @{ $params{module} } ]
        : $cache->{all};
 }