Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 9569aa4b

Von Moritz Bunkus vor fast 12 Jahren hinzugefügt

  • ID 9569aa4b1211dbc40667a2999dd7b87304f8bd32
  • Vorgänger 67ca0f93
  • Nachfolger 2bc66c62

scripts/dbupgrade2_tool.pl: UTF-8-encodierte Upgradescripte richtig behandeln

Unterschiede anzeigen:

scripts/dbupgrade2_tool.pl
331 331
    exit 0;
332 332
  }
333 333

  
334
  my $db_charset = $::lx_office_conf{system}->{dbcharset};
335
  $db_charset ||= Common::DEFAULT_CHARSET();
336

  
334 337
  foreach my $control (@upgradescripts) {
335 338
    $control->{file} =~ /\.(sql|pl)$/;
336 339
    my $file_type = $1;
......
339 342
    print "Applying upgrade $control->{file}\n";
340 343

  
341 344
    if ($file_type eq "sql") {
342
      $dbupgrader->process_query($dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control);
345
      $dbupgrader->process_query($dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control, $db_charset);
343 346
    } else {
344
      $dbupgrader->process_perl_script($dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control);
347
      $dbupgrader->process_perl_script($dbh, "sql/$form->{dbdriver}-upgrade2/$control->{file}", $control, $db_charset);
345 348
    }
346 349
  }
347 350

  

Auch abrufbar als: Unified diff