Skip to content

Commit

Permalink
Fixed #3746
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Jan 29, 2019
1 parent 188c9a4 commit 73471ad
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Fixed a bug where the Settings → Plugins page was showing extra “Missing” rows for any unlicensed plugins that were Composer-installed but not Craft-installed. ([#3726](https://github.com/craftcms/cms/issues/3726))
- Fixed an error that could occur when viewing trashed elements.
- Fixed a bug where many system message translations were missing line breaks. ([#3737](https://github.com/craftcms/cms/issues/3737))
- Fixed a bug where unparsed markdown code was present in the Control Panel error message displayed when the system was offline. ([#3746](https://github.com/craftcms/cms/issues/3746))

## 3.1.5 - 2019-01-25

Expand Down
4 changes: 0 additions & 4 deletions src/web/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -767,13 +767,9 @@ private function _enforceSystemStatusPermissions(Request $request)
if (!$this->getUser()->getIsGuest()) {
if ($request->getIsCpRequest()) {
$error = Craft::t('app', 'Your account doesn’t have permission to access the Control Panel when the system is offline.');
$logoutUrl = UrlHelper::cpUrl('logout');
} else {
$error = Craft::t('app', 'Your account doesn’t have permission to access the site when the system is offline.');
$logoutUrl = UrlHelper::siteUrl(Craft::$app->getConfig()->getGeneral()->getLogoutPath());
}

$error .= ' [' . Craft::t('app', 'Log out?') . '](' . $logoutUrl . ')';
} else {
// If this is a CP request, redirect to the Login page
if ($this->getRequest()->getIsCpRequest()) {
Expand Down

0 comments on commit 73471ad

Please sign in to comment.