Skip to content

Commit 8b6a8ae

Browse files
committed
MT#64615 sync-db skip get_current_site() for non multi site
* skip get_current_site() and return undef if called on a non multi site enabled system. Change-Id: I61d2c803c00da83524a1904c0b697ea20eb8c9d0
1 parent cf3270b commit 8b6a8ae

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

helper/sync-db

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,16 @@ sub get_current_site {
8080

8181
sub get_multi_site_data {
8282
my $multi_site = $config->{sites_enable} // 'no' eq 'yes';
83+
84+
return unless $multi_site;
85+
8386
my $sites = $config->{sites} // {};
8487
my $current_site = get_current_site();
8588
my $skip_site_prefixes = [];
8689

87-
if ($multi_site && $current_site) {
88-
foreach my $site_name (keys %{$sites}) {
89-
next if $site_name eq $current_site->{name};
90-
push @{$skip_site_prefixes}, "$site_name:";
91-
}
90+
foreach my $site_name (keys %{$sites}) {
91+
next if $site_name eq $current_site->{name};
92+
push @{$skip_site_prefixes}, "$site_name:";
9293
}
9394

9495
return {

0 commit comments

Comments
 (0)