CsvImport: Mulitplex: handle_cvars-Routine verlassen, wenn Objekt keine CVars kann

diff --git a/SL/Controller/CsvImport/BaseMulti.pm b/SL/Controller/CsvImport/BaseMulti.pm
index 5168ae28c8c0edbd8ca736e1910c20ec947d760b..2632722adf41e4f762019663decfa8d5012d8b35 100644 (file)
--- a/SL/Controller/CsvImport/BaseMulti.pm
+++ b/SL/Controller/CsvImport/BaseMulti.pm
@@ -170,6 +170,7 @@ sub handle_cvars {
   my ($self, $entry, %params) = @_;
 
   return if @{ $entry->{errors} };
   my ($self, $entry, %params) = @_;
 
   return if @{ $entry->{errors} };

+  return unless $entry->{object}->can('cvars_by_config');

 
   my %type_to_column = ( text      => 'text_value',
                          textfield => 'text_value',
 
   my %type_to_column = ( text      => 'text_value',
                          textfield => 'text_value',


@@ -183,7 +184,7 @@ sub handle_cvars {
 
   # autovivify all cvars (cvars_by_config will do that for us)
   my @cvars;
 
   # autovivify all cvars (cvars_by_config will do that for us)
   my @cvars;

-  @cvars = @{ $entry->{object}->cvars_by_config } if $entry->{object}->can('cvars_by_config');
+  @cvars = @{ $entry->{object}->cvars_by_config };

 
   foreach my $config (@{ $self->cvar_configs_by->{row_ident}->{$entry->{raw_data}->{datatype}} }) {
     next unless exists $entry->{raw_data}->{ "cvar_" . $config->name };
 
   foreach my $config (@{ $self->cvar_configs_by->{row_ident}->{$entry->{raw_data}->{datatype}} }) {
     next unless exists $entry->{raw_data}->{ "cvar_" . $config->name };