Skip to content

Commit

Permalink
Merge pull request #2969 from ademers/develop
Browse files Browse the repository at this point in the history
Fixes #2968
  • Loading branch information
brandonkelly authored Jun 7, 2018
2 parents 1f9a8d4 + 2362853 commit 2ed8ccb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/services/Sites.php
Original file line number Diff line number Diff line change
Expand Up @@ -1036,8 +1036,8 @@ private function _loadAllSites()
}
}

if (is_array($generalConfig->siteName) && isset($generalConfig->siteUrl[$site->handle])) {
$site->overrideName($generalConfig->siteUrl[$site->handle]);
if (is_array($generalConfig->siteName) && isset($generalConfig->siteName[$site->handle])) {
$site->overrideName($generalConfig->siteName[$site->handle]);
}
if (is_array($generalConfig->siteUrl) && isset($generalConfig->siteUrl[$site->handle])) {
$site->overrideBaseUrl($generalConfig->siteUrl[$site->handle]);
Expand Down

0 comments on commit 2ed8ccb

Please # to comment.