Skip to content

Commit

Permalink
Fixed #3049
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Jun 30, 2018
1 parent 0683791 commit 9dc6978
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Changed
- `craft\events\SiteEvent` now has a `$oldPrimarySiteId` property, which will be set to the previous primary site ID (which may stil be the current site ID, if it didn’t just change).
- `craft\helpers\Search::normalizeKeywords()` now has a `$langage` argument, which can be set if the character mappings should be pulled from a different language than the current app language.
- `craft\services\Sites::getEditableSiteIds()` and `getEditableSites()` now return the same things as `getAllSiteIds()` and `getAllSites()` when there’s only one site. ([#3049](https://github.com/craftcms/cms/issues/3049))

### Fixed
- Fixed a bug where user verification links could get mangled when emails were parsed as Markdown, if the verification code contained two or more underscores.
Expand Down
4 changes: 4 additions & 0 deletions src/services/Sites.php
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,10 @@ public function getPrimarySite(): Site
*/
public function getEditableSiteIds(): array
{
if (!Craft::$app->getIsMultiSite()) {
return $this->getAllSiteIds();
}

if ($this->_editableSiteIds !== null) {
return $this->_editableSiteIds;
}
Expand Down

0 comments on commit 9dc6978

Please sign in to comment.