X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDBUpgrade2.pm;h=ae07d1c084e7ff6868accad13779a9aa084dabed;hb=f521b94b94cbd7364006304546fc54c6815a48e2;hp=cb8a9b26fe927847fd0249e3fb85c5ec3f200790;hpb=53c7990b4993f759c1ddfa33f84d1b3560b0a61e;p=kivitendo-erp.git diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm index cb8a9b26f..ae07d1c08 100644 --- a/SL/DBUpgrade2.pm +++ b/SL/DBUpgrade2.pm @@ -3,9 +3,11 @@ package SL::DBUpgrade2; use SL::Common; require Exporter; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); -@EXPORT = qw(parse_dbupdate_controls sort_dbupdate_controls); +our @EXPORT = qw(parse_dbupdate_controls sort_dbupdate_controls); + +use strict; sub parse_dbupdate_controls { $main::lxdebug->enter_sub(); @@ -47,6 +49,8 @@ sub parse_dbupdate_controls { } } + next if ($control->{ignore}); + $control->{charset} ||= Common::DEFAULT_CHARSET; if (!$control->{"tag"}) { @@ -122,13 +126,13 @@ sub _control_error { } sub _dbupdate2_calculate_depth { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); my ($tree, $tag) = @_; my $node = $tree->{$tag}; - return $main::lxdebug->leave_sub() if (defined($node->{"depth"})); + return $main::lxdebug->leave_sub(2) if (defined($node->{"depth"})); my $max_depth = 0; @@ -140,7 +144,7 @@ sub _dbupdate2_calculate_depth { $node->{"depth"} = $max_depth + 1; - $main::lxdebug->leave_sub(); + $main::lxdebug->leave_sub(2); } sub sort_dbupdate_controls {